Stage 2 of the namespace change. Bulk of documentation fixed.
diff --git a/core/api/src/docs/application.txt b/core/api/src/docs/application.txt
index bf97b53..2deb3b2 100644
--- a/core/api/src/docs/application.txt
+++ b/core/api/src/docs/application.txt
@@ -65,7 +65,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/docsupport/ApplicationDocs.java
+source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java
tag=application1
-----------
@@ -76,7 +76,7 @@
[snippet,java]
-----------
-source=core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java
+source=core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java
tag=actual
-----------
@@ -94,7 +94,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/docsupport/ApplicationDocs.java
+source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java
tag=application2
-----------
@@ -109,7 +109,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/docsupport/ApplicationDocs.java
+source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java
tag=application3
-----------
diff --git a/core/api/src/docs/composition.txt b/core/api/src/docs/composition.txt
index 467fd7a..68779fe 100644
--- a/core/api/src/docs/composition.txt
+++ b/core/api/src/docs/composition.txt
@@ -58,7 +58,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/docsupport/CompositionDocs.java
+source=core/api/src/test/java/org/apache/zest/api/docsupport/CompositionDocs.java
tag=comp1
-----------
@@ -66,7 +66,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/docsupport/CompositionDocs.java
+source=core/api/src/test/java/org/apache/zest/api/docsupport/CompositionDocs.java
tag=comp2
-----------
diff --git a/core/api/src/docs/concern.txt b/core/api/src/docs/concern.txt
index 3d6e36f..47e0ac7 100644
--- a/core/api/src/docs/concern.txt
+++ b/core/api/src/docs/concern.txt
@@ -60,21 +60,21 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/concern/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java
tag=class
--------------
We can also use an AppliesToFilter to define which methods should be wrapped with the concern, like this;
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/concern/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java
tag=filter
--------------
And finally an example of how to use annotations to mark indvidual methods for being wrapped by the concern.
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/concern/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java
tag=annotation
--------------
diff --git a/core/api/src/docs/configuration.txt b/core/api/src/docs/configuration.txt
index 75ce54d..dd4f84f 100644
--- a/core/api/src/docs/configuration.txt
+++ b/core/api/src/docs/configuration.txt
@@ -34,7 +34,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/configuration/MailServiceConfiguration.java
+source=core/api/src/test/java/org/apache/zest/api/configuration/MailServiceConfiguration.java
tag=configuration
--------------
@@ -49,7 +49,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/configuration/MailService.java
+source=core/api/src/test/java/org/apache/zest/api/configuration/MailService.java
tag=read
--------------
@@ -59,7 +59,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/configuration/MailService.java
+source=core/api/src/test/java/org/apache/zest/api/configuration/MailService.java
tag=write
--------------
diff --git a/core/api/src/docs/decoratormixin.txt b/core/api/src/docs/decoratormixin.txt
index 548ae24..77ed241 100644
--- a/core/api/src/docs/decoratormixin.txt
+++ b/core/api/src/docs/decoratormixin.txt
@@ -32,7 +32,7 @@
We start with the FooModel interface;
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/FooModel.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/FooModel.java
tag=plain
--------------
@@ -41,7 +41,7 @@
Each of the views looks like this;
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/View1.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/View1.java
tag=decorator
--------------
@@ -53,7 +53,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/FooModel.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/FooModel.java
tag=decorator
--------------
@@ -62,7 +62,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/DecoratorMixinTest.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java
tag=create
--------------
@@ -70,7 +70,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/DecoratorMixinTest.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java
tag=assembly
--------------
@@ -78,6 +78,6 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/mixin/decoratorMixin/DecoratorMixinTest.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java
tag=test
--------------
diff --git a/core/api/src/docs/metrics.txt b/core/api/src/docs/metrics.txt
index 65f80a7..3f81ea1 100644
--- a/core/api/src/docs/metrics.txt
+++ b/core/api/src/docs/metrics.txt
@@ -30,7 +30,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=common
--------------
@@ -48,7 +48,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=gauge
--------------
@@ -56,14 +56,14 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=counter
--------------
== Histogram ==
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=histogram
--------------
@@ -71,7 +71,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=meter
--------------
@@ -81,7 +81,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=timer
--------------
@@ -89,6 +89,6 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/metrics/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java
tag=healthcheck
--------------
diff --git a/core/api/src/docs/mixin.txt b/core/api/src/docs/mixin.txt
index 625f894..989b7cd 100644
--- a/core/api/src/docs/mixin.txt
+++ b/core/api/src/docs/mixin.txt
@@ -25,7 +25,7 @@
Mixin Type can be very simple, like;
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/BankAccount.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/BankAccount.java
tag=mixinType
-----------
@@ -68,12 +68,12 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/Something.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/Something.java
tag=something
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/SomethingMixin.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/SomethingMixin.java
tag=something
-----------
In the above sample, the SomethingMixin will be made part of the Something composite.
@@ -83,17 +83,17 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/Car.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/Car.java
tag=mixin
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/Startable.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/Startable.java
tag=mixin
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/Vehicle.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java
tag=mixin
-----------
@@ -103,22 +103,22 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/partial/Car.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/partial/Car.java
tag=partial
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/partial/Vehicle.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/partial/Vehicle.java
tag=partial
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/partial/SpeedLocation.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/partial/SpeedLocation.java
tag=partial
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/partial/SpeedMixin.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/partial/SpeedMixin.java
tag=partial
-----------
@@ -142,7 +142,7 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/privateMixin/Cargo.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/Cargo.java
tag=private
-----------
@@ -152,12 +152,12 @@
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/privateMixin/CargoMixin.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/CargoMixin.java
tag=private
-----------
[snippet,java]
-----------
-source=core/api/src/test/java/org/qi4j/api/mixin/privateMixin/CargoState.java
+source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/CargoState.java
tag=private
-----------
@@ -179,7 +179,7 @@
[snippet,java]
-----------
-source=core/api/src/main/java/org/qi4j/api/property/PropertyMixin.java
+source=core/api/src/main/java/org/apache/zest/api/property/PropertyMixin.java
tag=actual
-----------
diff --git a/core/api/src/docs/servicecomposite.txt b/core/api/src/docs/servicecomposite.txt
index 0736d90..4016195 100644
--- a/core/api/src/docs/servicecomposite.txt
+++ b/core/api/src/docs/servicecomposite.txt
@@ -54,7 +54,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=instantiateOnStartup
--------------
@@ -69,7 +69,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=activation1
--------------
@@ -77,7 +77,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=activation2
--------------
@@ -85,7 +85,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=activation3
--------------
@@ -102,7 +102,7 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=tag
--------------
@@ -110,6 +110,6 @@
[snippet,java]
--------------
-source=core/api/src/test/java/org/qi4j/api/service/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java
tag=UseTag
--------------
diff --git a/core/api/src/docs/valuecomposite.txt b/core/api/src/docs/valuecomposite.txt
index 7f06ec7..7aad0c4 100644
--- a/core/api/src/docs/valuecomposite.txt
+++ b/core/api/src/docs/valuecomposite.txt
@@ -86,7 +86,7 @@
[snippet,java]
----
-source=core/api/src/test/java/org/qi4j/api/value/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java
tag=default
----
@@ -110,7 +110,7 @@
[snippet,java]
----
-source=core/api/src/test/java/org/qi4j/api/value/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java
tag=service
----
@@ -130,7 +130,7 @@
[snippet,java]
----
-source=core/api/src/test/java/org/qi4j/api/value/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java
tag=stream
----
@@ -143,7 +143,7 @@
[snippet,java]
----
-source=core/api/src/test/java/org/qi4j/api/value/DocumentationSupport.java
+source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java
tag=io
----
diff --git a/core/bootstrap/src/docs/bootstrap.txt b/core/bootstrap/src/docs/bootstrap.txt
index 56be2d0..6f4af65 100644
--- a/core/bootstrap/src/docs/bootstrap.txt
+++ b/core/bootstrap/src/docs/bootstrap.txt
@@ -27,7 +27,7 @@
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
+The _assembly_ is preceeded by the creation of the _Zest Runtime_. The _assembly_ can be declared fully by defining
all modules and layers, and how the layers are sitting on top of each other, OR one can utilize one of the two
convenience assemblies, one for a _pancake_ pattern, where all layers are top on each other, or one with a single module
in a single layer, useful for small applications, spikes and tests. The +bootstrap+ system has several ways to acheive
@@ -53,7 +53,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=objects
--------------
@@ -62,7 +62,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=transients
--------------
@@ -71,7 +71,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=values
--------------
@@ -80,7 +80,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=entities
--------------
@@ -89,7 +89,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=services
--------------
@@ -97,7 +97,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=tagged-services
--------------
@@ -105,7 +105,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=imported-services
--------------
@@ -113,7 +113,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=properties-defaults
--------------
@@ -136,7 +136,7 @@
[snippet,java]
--------------
-source=libraries/rest-server/src/test/java/org/qi4j/library/rest/server/DocumentationSupport.java
+source=libraries/rest-server/src/test/java/org/apache/zest/library/rest/server/DocumentationSupport.java
tag=UsingAssembler
--------------
@@ -160,7 +160,7 @@
[snippet,java]
--------------
-source=extensions/entitystore-jdbm/src/test/java/org/qi4j/entitystore/jdbm/DocumentationSupport.java
+source=extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
tag=UsingAssembler
--------------
@@ -214,7 +214,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=singleton
--------------
@@ -268,7 +268,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=pancake
--------------
@@ -283,7 +283,7 @@
[snippet,java]
--------------
-source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java
tag=full
--------------
diff --git a/core/functional/src/docs/functional.txt b/core/functional/src/docs/functional.txt
index 461e091..153dcc5 100644
--- a/core/functional/src/docs/functional.txt
+++ b/core/functional/src/docs/functional.txt
@@ -34,7 +34,7 @@
[snippet,java]
-----------
-source=core/functional/src/test/java/org/qi4j/functional/docsupport/FunctionalDocs.java
+source=core/functional/src/test/java/org/apache/zest/functional/docsupport/FunctionalDocs.java
tag=func1
-----------
@@ -42,7 +42,7 @@
[snippet,java]
-----------
-source=core/functional/src/test/java/org/qi4j/functional/docsupport/FunctionalDocs.java
+source=core/functional/src/test/java/org/apache/zest/functional/docsupport/FunctionalDocs.java
tag=func2
-----------
diff --git a/core/io/src/docs/io.txt b/core/io/src/docs/io.txt
index d8ffef8..3abd508 100644
--- a/core/io/src/docs/io.txt
+++ b/core/io/src/docs/io.txt
@@ -48,14 +48,14 @@
make the abstraction a little bit more encompassing than "just" files. So how does that look like then?
== First Examples ==
-The most common inputs and outputs are collected in the org.qi4j.io.Inputs and org.qi4j.io.Outputs classes as static
+The most common inputs and outputs are collected in the org.apache.zest.io.Inputs and org.apache.zest.io.Outputs classes as static
factory methods, but you can create your (more about that later).
So, we want to read a text file and write the content into another text file, right? This is how it is done;
[snippet,java]
-----------
-source=core/io/src/test/java/org/qi4j/io/docsupport/IoDocs.java
+source=core/io/src/test/java/org/apache/zest/io/docsupport/IoDocs.java
tag=io1
-----------
@@ -66,7 +66,7 @@
[snippet,java]
-----------
-source=core/io/src/test/java/org/qi4j/io/docsupport/IoDocs.java
+source=core/io/src/test/java/org/apache/zest/io/docsupport/IoDocs.java
tag=io2
-----------
@@ -80,12 +80,12 @@
destination could be a File, String or an OutputStream. It is important to note that there is a strong separation of
concern between them. Let's look at the on at a time.
-== org.qi4j.io.Input ==
+== org.apache.zest.io.Input ==
This interface simply has a transferTo() method, which takes an Output. The formal definition is;
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Input.java
+source=core/io/src/main/java/org/apache/zest/io/Input.java
tag=input
--------------
@@ -102,16 +102,16 @@
(ReceiverThrowable) which the transferTo() method may also throw as the data may not be accepted and such exception
will bubble up to the transferTo() method (the client's view of the transfer).
-== org.qi4j.io.Output ==
+== org.apache.zest.io.Output ==
The output interface is likewise fairly simple;
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Output.java
+source=core/io/src/main/java/org/apache/zest/io/Output.java
tag=output
--------------
-It can simply receive data from a org.qi4j.io.Sender.
+It can simply receive data from a org.apache.zest.io.Sender.
Hey, hold on! Why is it not receiving from an Input? Because the Input is the client's entry point and of no use to
the Output as such. Instead, the Output will tell the Sender (which is handed to from the Input or an transformation)
@@ -126,16 +126,16 @@
interface. For O/S resources, they are handled purely inside the Input and Output implementations, where are the
Sender/Receiver are effectively dealing with the data itself.
-== org.qi4j.io.Transforms ==
+== org.apache.zest.io.Transforms ==
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,
+simply need to prepare easy to use static factory methods, which are found in the org.apache.zest.io.Transforms class. Again,
it is fairly straight forward to create your own Transforms if you need something not provided here.
The current transformations available are;
* filter - takes a Specification and only forwards data items conforming to the Specification.
- * map - takes a org.qi4j.functional.Function to convert an item from one type to (potentially) another, and any
+ * map - takes a org.apache.zest.functional.Function to convert an item from one type to (potentially) another, and any
possible change along the way.
* filteredMap - is a combination of a filter and a map. If the Specification is satisfied, the map function is
applied, otherwise the item is passed through unaffected.
@@ -159,7 +159,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Transforms.java
+source=core/io/src/main/java/org/apache/zest/io/Transforms.java
tag=counter
--------------
@@ -170,7 +170,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Transforms.java
+source=core/io/src/main/java/org/apache/zest/io/Transforms.java
tag=progress
--------------
@@ -184,7 +184,7 @@
[snippet,java]
--------------
-source=core/functional/src/main/java/org/qi4j/functional/Specification.java
+source=core/functional/src/main/java/org/apache/zest/functional/Specification.java
tag=specification
--------------
@@ -194,30 +194,30 @@
[snippet,java]
--------------
-source=core/functional/src/test/java/org/qi4j/functional/IntegerRangeSpecificationTest.java
+source=core/functional/src/test/java/org/apache/zest/functional/IntegerRangeSpecificationTest.java
tag=specification
--------------
== Ready-to-use components ==
Input and Output implementations at first glance look quite scary. Taking a closer look and it can be followed. But to
-simplify for users, the org.qi4j.io.Inputs and org.qi4h.io.Outputs contains static factory methods for many useful
+simplify for users, the org.apache.zest.io.Inputs and org.apache.zest.io.Outputs contains static factory methods for many useful
sources and destinations.
-== org.qi4j.io.Inputs ==
+== org.apache.zest.io.Inputs ==
The current set of ready-to-use Input implementations are;
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Inputs.java
+source=core/io/src/main/java/org/apache/zest/io/Inputs.java
tag=method
--------------
-== org.qi4j.io.Outputs ==
+== org.apache.zest.io.Outputs ==
The current set of ready-to-use Input implementations are;
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Outputs.java
+source=core/io/src/main/java/org/apache/zest/io/Outputs.java
tag=method
--------------
diff --git a/core/runtime/src/docs/runtime.txt b/core/runtime/src/docs/runtime.txt
index ec2c9f3..24eb301 100644
--- a/core/runtime/src/docs/runtime.txt
+++ b/core/runtime/src/docs/runtime.txt
@@ -22,10 +22,10 @@
--------------
First of all, your code should never, ever, have a dependency on 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 SPI Extension is needed.
+probably contact users@zest.apache.org mailing list and see if your usecase can either be solved in a existing way or
+perhaps that a new Core SPI Extension is needed.
include::../../build/docs/buildinfo/artifact.txt[]
Let's repeat that; *Never, never, ever depend on Core Runtime*. Make sure that the compile dependency does NOT include
-the `org.qi4j.core.runtime` jar.
\ No newline at end of file
+the `org.apache.zest.core.runtime` jar.
\ No newline at end of file
diff --git a/core/runtime/src/test/java/org/qi4j/constraints/PropertyConstraintTest.java b/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/constraints/PropertyConstraintTest.java
rename to core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
index 6fa21e0..8307140 100644
--- a/core/runtime/src/test/java/org/qi4j/constraints/PropertyConstraintTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.constraints;
+package org.apache.zest.constraints;
import java.util.Collection;
import org.apache.zest.api.composite.TransientBuilder;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi230/Qi230IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi230/Qi230IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
index 0cd5bd8..02eff2e 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi230/Qi230IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
@@ -12,7 +12,7 @@
*
*/
-package org.qi4j.regression.qi230;
+package org.apache.zest.regression.qi230;
import org.junit.Test;
import org.apache.zest.api.Qi4j;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
index bd9f2fb..8cafbe6 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi377;
+package org.apache.zest.regression.qi377;
import org.junit.Test;
import org.apache.zest.api.association.Association;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
index ce8c73b..cef8c94 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi377;
+package org.apache.zest.regression.qi377;
import org.apache.zest.api.common.UseDefaults;
import org.apache.zest.api.property.Property;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi377/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi377/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
index 457845e..959d29d 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi377/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi377;
+package org.apache.zest.regression.qi377;
import org.junit.Test;
import org.apache.zest.api.common.UseDefaults;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi377/SetAssociationInSideEffectTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi377/SetAssociationInSideEffectTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
index 95cdc67..b057c4e 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi377/SetAssociationInSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi377;
+package org.apache.zest.regression.qi377;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
index 2b52818..276d393 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi377;
+package org.apache.zest.regression.qi377;
import org.junit.Test;
import org.apache.zest.api.entity.Identity;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi382/Qi382Test.java b/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi382/Qi382Test.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
index 2938172..36831b2 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi382/Qi382Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi382;
+package org.apache.zest.regression.qi382;
import org.junit.Test;
import org.apache.zest.api.association.Association;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi383/Qi383Test.java b/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi383/Qi383Test.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
index 6b199c4..8a50f61 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi383/Qi383Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi383;
+package org.apache.zest.regression.qi383;
import org.junit.Test;
import org.apache.zest.api.entity.EntityComposite;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi53/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi53/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
index 5a2806c..d13e846 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi53/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.qi4j.regression.qi53;
+package org.apache.zest.regression.qi53;
import org.junit.Test;
import org.apache.zest.api.composite.TransientBuilder;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi55/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi55/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
index 74862c1..a823adc 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi55/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.qi4j.regression.qi55;
+package org.apache.zest.regression.qi55;
import org.junit.Test;
import org.apache.zest.api.injection.scope.Uses;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi59/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi59/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
index 7008045..99d62b0 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi59/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
@@ -12,7 +12,7 @@
*
*/
-package org.qi4j.regression.qi59;
+package org.apache.zest.regression.qi59;
import org.junit.Test;
import org.apache.zest.api.entity.EntityComposite;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi65/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi65/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
index b386407..00ad687 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi65/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.qi4j.regression.qi65;
+package org.apache.zest.regression.qi65;
import org.junit.Test;
import org.apache.zest.api.composite.TransientComposite;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi74/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi74/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
index c2ca0db..ea43caa 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi74/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi74;
+package org.apache.zest.regression.qi74;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi78/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/qi4j/regression/qi78/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
index f1477c7..d142bf6 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi78/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi78;
+package org.apache.zest.regression.qi78;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/runtime/src/test/java/org/qi4j/regression/qi94/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/qi4j/regression/qi94/IssueTest.java
rename to core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
index 80f4016..0ce42de 100644
--- a/core/runtime/src/test/java/org/qi4j/regression/qi94/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.regression.qi94;
+package org.apache.zest.regression.qi94;
import org.junit.Test;
import org.apache.zest.api.association.Association;
diff --git a/core/spi/src/docs/spi.txt b/core/spi/src/docs/spi.txt
index 32fc8b2..1e54c11 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 _Zest 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.
@@ -37,7 +37,7 @@
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
+Core Extension SPI. If you think that is needed, please contact users@dev.apache.org mailing list, to see if your usecase
can be solved in a support manner, or that we need to extend the Core API to support it.
:leveloffset: {level3}
diff --git a/core/testsupport/src/docs/testsupport.txt b/core/testsupport/src/docs/testsupport.txt
index f3c9585..f45ca30 100644
--- a/core/testsupport/src/docs/testsupport.txt
+++ b/core/testsupport/src/docs/testsupport.txt
@@ -33,7 +33,7 @@
[snippet,java]
--------------
-source=tutorials/hello/src/test/java/org/qi4j/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
tag=step1
--------------
@@ -42,15 +42,15 @@
[snippet,java]
--------------
-source=tutorials/hello/src/test/java/org/qi4j/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
tag=step2
--------------
-In this case we declare that we have a ValueComposite of type org.qi4j.tutorials.hello.Hello which looks like
+In this case we declare that we have a ValueComposite of type org.apache.zest.tutorials.hello.Hello which looks like
[snippet,java]
--------------
-source=tutorials/hello/src/main/java/org/qi4j/tutorials/hello/Hello.java
+source=tutorials/hello/src/main/java/org/apache/zest/tutorials/hello/Hello.java
tag=body
--------------
@@ -61,7 +61,7 @@
[snippet,java]
--------------
-source=tutorials/hello/src/test/java/org/qi4j/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
tag=step3
--------------
diff --git a/extensions/cache-ehcache/src/docs/cache-ehcache.txt b/extensions/cache-ehcache/src/docs/cache-ehcache.txt
index 32c8bc8..36444f6 100644
--- a/extensions/cache-ehcache/src/docs/cache-ehcache.txt
+++ b/extensions/cache-ehcache/src/docs/cache-ehcache.txt
@@ -40,7 +40,7 @@
[snippet,java]
----
-source=extensions/cache-ehcache/src/test/java/org/qi4j/cache/ehcache/EhCacheTest.java
+source=extensions/cache-ehcache/src/test/java/org/apache/zest/cache/ehcache/EhCacheTest.java
tag=assembly
----
@@ -51,6 +51,6 @@
[snippet,java]
----
-source=extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCacheConfiguration.java
+source=extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCacheConfiguration.java
tag=config
----
diff --git a/extensions/cache-memcache/src/docs/cache-memcache.txt b/extensions/cache-memcache/src/docs/cache-memcache.txt
index 5cd5081..12a075e 100644
--- a/extensions/cache-memcache/src/docs/cache-memcache.txt
+++ b/extensions/cache-memcache/src/docs/cache-memcache.txt
@@ -47,7 +47,7 @@
[snippet,java]
----
-source=extensions/cache-memcache/src/test/java/org/qi4j/cache/memcache/MemcacheCachePoolTest.java
+source=extensions/cache-memcache/src/test/java/org/apache/zest/cache/memcache/MemcacheCachePoolTest.java
tag=assembly
----
@@ -58,7 +58,7 @@
[snippet,java]
----
-source=extensions/cache-memcache/src/main/java/org/qi4j/cache/memcache/MemcacheConfiguration.java
+source=extensions/cache-memcache/src/main/java/org/apache/zest/cache/memcache/MemcacheConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-file/src/docs/es-file.txt b/extensions/entitystore-file/src/docs/es-file.txt
index 1cf25cc..9c5057d 100644
--- a/extensions/entitystore-file/src/docs/es-file.txt
+++ b/extensions/entitystore-file/src/docs/es-file.txt
@@ -37,7 +37,7 @@
[snippet,java]
----
-source=extensions/entitystore-file/src/test/java/org/qi4j/entitystore/file/FileEntityStoreTest.java
+source=extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
tag=assembly
----
@@ -47,7 +47,7 @@
[snippet,java]
----
-source=extensions/entitystore-file/src/main/java/org/qi4j/entitystore/file/FileEntityStoreConfiguration.java
+source=extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt b/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
index e9b3dbf..cb02522 100644
--- a/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
+++ b/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/entitystore-hazelcast/src/test/java/org/qi4j/entitystore/hazelcast/HazelcastEntityStoreTest.java
+source=extensions/entitystore-hazelcast/src/test/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreTest.java
tag=assembly
----
@@ -45,7 +45,7 @@
[snippet,java]
----
-source=extensions/entitystore-hazelcast/src/main/java/org/qi4j/entitystore/hazelcast/HazelcastConfiguration.java
+source=extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-jclouds/src/docs/es-jclouds.txt b/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
index baaddf2..6067168 100644
--- a/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
+++ b/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
@@ -44,7 +44,7 @@
[snippet,java]
----
-source=extensions/entitystore-jclouds/src/test/java/org/qi4j/entitystore/jclouds/JCloudsTransientTest.java
+source=extensions/entitystore-jclouds/src/test/java/org/apache/zest/entitystore/jclouds/JCloudsTransientTest.java
tag=assembly
----
@@ -54,6 +54,6 @@
[snippet,java]
----
-source=extensions/entitystore-jclouds/src/main/java/org/qi4j/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
+source=extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
index 7a90daa..0c6d3c8 100644
--- a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
+++ b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/entitystore-jdbm/src/test/java/org/qi4j/entitystore/jdbm/DocumentationSupport.java
+source=extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
tag=UsingAssembler
----
@@ -45,7 +45,7 @@
[snippet,java]
----
-source=extensions/entitystore-jdbm/src/main/java/org/qi4j/entitystore/jdbm/JdbmConfiguration.java
+source=extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-leveldb/src/docs/es-leveldb.txt b/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
index ffbc16a..8fae082 100644
--- a/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
+++ b/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
@@ -43,7 +43,7 @@
[snippet,java]
----
-source=extensions/entitystore-leveldb/src/test/java/org/qi4j/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
+source=extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
tag=assembly
----
@@ -53,7 +53,7 @@
[snippet,java]
----
-source=extensions/entitystore-leveldb/src/main/java/org/qi4j/entitystore/leveldb/LevelDBEntityStoreConfiguration.java
+source=extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-memory/src/docs/es-memory.txt b/extensions/entitystore-memory/src/docs/es-memory.txt
index 93da628..9bba9af 100644
--- a/extensions/entitystore-memory/src/docs/es-memory.txt
+++ b/extensions/entitystore-memory/src/docs/es-memory.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/entitystore-memory/src/test/java/org/qi4j/entitystore/memory/MemoryEntityStoreTest.java
+source=extensions/entitystore-memory/src/test/java/org/apache/zest/entitystore/memory/MemoryEntityStoreTest.java
tag=assembly
----
diff --git a/extensions/entitystore-mongodb/src/docs/es-mongodb.txt b/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
index c24746f..8c7e55e 100644
--- a/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
+++ b/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
@@ -36,7 +36,7 @@
[snippet,java]
----
-source=extensions/entitystore-mongodb/src/test/java/org/qi4j/entitystore/mongodb/MongoMapEntityStoreTest.java
+source=extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
tag=assembly
----
@@ -46,6 +46,6 @@
[snippet,java]
----
-source=extensions/entitystore-mongodb/src/main/java/org/qi4j/entitystore/mongodb/MongoEntityStoreConfiguration.java
+source=extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-preferences/src/docs/es-preferences.txt b/extensions/entitystore-preferences/src/docs/es-preferences.txt
index 5727b5f..dfb111b 100644
--- a/extensions/entitystore-preferences/src/docs/es-preferences.txt
+++ b/extensions/entitystore-preferences/src/docs/es-preferences.txt
@@ -37,6 +37,6 @@
[snippet,java]
----
-source=extensions/entitystore-preferences/src/test/java/org/qi4j/entitystore/DocumentationSupport.java
+source=extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
tag=assembly
----
diff --git a/extensions/entitystore-redis/src/docs/es-redis.txt b/extensions/entitystore-redis/src/docs/es-redis.txt
index dae3644..11d1def 100644
--- a/extensions/entitystore-redis/src/docs/es-redis.txt
+++ b/extensions/entitystore-redis/src/docs/es-redis.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/entitystore-redis/src/test/java/org/qi4j/entitystore/redis/RedisMapEntityStoreTest.java
+source=extensions/entitystore-redis/src/test/java/org/apache/zest/entitystore/redis/RedisMapEntityStoreTest.java
tag=assembly
----
@@ -46,6 +46,6 @@
[snippet,java]
----
-source=extensions/entitystore-redis/src/main/java/org/qi4j/entitystore/redis/RedisEntityStoreConfiguration.java
+source=extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/RedisEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-riak/src/docs/es-riak.txt b/extensions/entitystore-riak/src/docs/es-riak.txt
index 62e3cca..6ea2dc9 100644
--- a/extensions/entitystore-riak/src/docs/es-riak.txt
+++ b/extensions/entitystore-riak/src/docs/es-riak.txt
@@ -39,7 +39,7 @@
[snippet,java]
----
-source=extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java
+source=extensions/entitystore-riak/src/test/java/org/apache/zest/entitystore/riak/RiakHttpMapEntityStoreTest.java
tag=assembly
----
@@ -47,7 +47,7 @@
[snippet,java]
----
-source=extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java
+source=extensions/entitystore-riak/src/test/java/org/apache/zest/entitystore/riak/RiakProtobufMapEntityStoreTest.java
tag=assembly
----
@@ -57,7 +57,7 @@
[snippet,java]
----
-source=extensions/entitystore-riak/src/main/java/org/qi4j/entitystore/riak/RiakHttpEntityStoreConfiguration.java
+source=extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java
tag=config
----
@@ -65,6 +65,6 @@
[snippet,java]
----
-source=extensions/entitystore-riak/src/main/java/org/qi4j/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
+source=extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
tag=config
----
diff --git a/extensions/entitystore-sql/src/docs/es-sql.txt b/extensions/entitystore-sql/src/docs/es-sql.txt
index caa2659..97807c0 100644
--- a/extensions/entitystore-sql/src/docs/es-sql.txt
+++ b/extensions/entitystore-sql/src/docs/es-sql.txt
@@ -66,7 +66,7 @@
[snippet,java]
----
-source=extensions/entitystore-sql/src/test/java/org/qi4j/entitystore/sql/PostgreSQLEntityStoreTest.java
+source=extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java
tag=assembly
----
@@ -86,7 +86,7 @@
[snippet,java]
----
-source=extensions/entitystore-sql/src/test/java/org/qi4j/entitystore/sql/MySQLEntityStoreTest.java
+source=extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/MySQLEntityStoreTest.java
tag=assembly
----
@@ -109,7 +109,7 @@
[snippet,java]
----
-source=extensions/entitystore-sql/src/test/java/org/qi4j/entitystore/sql/SQLiteEntityStoreTest.java
+source=extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java
tag=assembly
----
@@ -129,7 +129,7 @@
[snippet,java]
----
-source=extensions/entitystore-sql/src/test/java/org/qi4j/entitystore/sql/H2SQLEntityStoreTest.java
+source=extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java
tag=assembly
----
@@ -150,7 +150,7 @@
[snippet,java]
----
-source=extensions/entitystore-sql/src/test/java/org/qi4j/entitystore/sql/DerbySQLEntityStoreTest.java
+source=extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java
tag=assembly
----
diff --git a/extensions/indexing-elasticsearch/src/docs/index-elasticsearch.txt b/extensions/indexing-elasticsearch/src/docs/index-elasticsearch.txt
index bced084..8c2ccb1 100644
--- a/extensions/indexing-elasticsearch/src/docs/index-elasticsearch.txt
+++ b/extensions/indexing-elasticsearch/src/docs/index-elasticsearch.txt
@@ -53,7 +53,7 @@
[snippet,java]
----
-source=extensions/indexing-elasticsearch/src/test/java/org/qi4j/index/elasticsearch/DocumentationSupport.java
+source=extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/DocumentationSupport.java
tag=memory
----
@@ -67,7 +67,7 @@
[snippet,java]
----
-source=extensions/indexing-elasticsearch/src/test/java/org/qi4j/index/elasticsearch/DocumentationSupport.java
+source=extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/DocumentationSupport.java
tag=filesystem
----
@@ -80,7 +80,7 @@
[snippet,java]
----
-source=extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
+source=extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java
tag=config
----
@@ -95,7 +95,7 @@
[snippet,java]
----
-source=extensions/indexing-elasticsearch/src/test/java/org/qi4j/index/elasticsearch/DocumentationSupport.java
+source=extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/DocumentationSupport.java
tag=cluster
----
@@ -107,7 +107,7 @@
[snippet,java]
----
-source=extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchClusterConfiguration.java
+source=extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchClusterConfiguration.java
tag=config
----
diff --git a/extensions/indexing-rdf/src/docs/index-rdf.txt b/extensions/indexing-rdf/src/docs/index-rdf.txt
index 620a071..7ef5f7e 100644
--- a/extensions/indexing-rdf/src/docs/index-rdf.txt
+++ b/extensions/indexing-rdf/src/docs/index-rdf.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/indexing-rdf/src/test/java/org/qi4j/index/rdf/DocumentationSupport.java
+source=extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/DocumentationSupport.java
tag=memory
----
@@ -49,7 +49,7 @@
[snippet,java]
----
-source=extensions/indexing-rdf/src/test/java/org/qi4j/index/rdf/DocumentationSupport.java
+source=extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/DocumentationSupport.java
tag=native
----
@@ -59,7 +59,7 @@
[snippet,java]
----
-source=libraries/rdf/src/main/java/org/qi4j/library/rdf/repository/NativeConfiguration.java
+source=libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeConfiguration.java
tag=config
----
@@ -72,7 +72,7 @@
[snippet,java]
----
-source=extensions/indexing-rdf/src/test/java/org/qi4j/index/rdf/DocumentationSupport.java
+source=extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/DocumentationSupport.java
tag=rdbms
----
@@ -82,6 +82,6 @@
[snippet,java]
----
-source=libraries/rdf/src/main/java/org/qi4j/library/rdf/repository/RdbmsRepositoryConfiguration.java
+source=libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/RdbmsRepositoryConfiguration.java
tag=config
----
diff --git a/extensions/indexing-solr/src/docs/index-solr.txt b/extensions/indexing-solr/src/docs/index-solr.txt
index e964831..f2183ac 100644
--- a/extensions/indexing-solr/src/docs/index-solr.txt
+++ b/extensions/indexing-solr/src/docs/index-solr.txt
@@ -37,7 +37,7 @@
[snippet,java]
----
-source=extensions/indexing-solr/src/test/java/org/qi4j/index/solr/SolrQueryServiceTest.java
+source=extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java
tag=assembly
----
diff --git a/extensions/indexing-sql/src/docs/index-sql.txt b/extensions/indexing-sql/src/docs/index-sql.txt
index 5d6fc57..81980c1 100644
--- a/extensions/indexing-sql/src/docs/index-sql.txt
+++ b/extensions/indexing-sql/src/docs/index-sql.txt
@@ -55,7 +55,7 @@
[snippet,java]
----
-source=extensions/indexing-sql/src/test/java/org/qi4j/index/sql/postgresql/SQLTestHelper.java
+source=extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/SQLTestHelper.java
tag=assembly
----
diff --git a/extensions/valueserialization-jackson/src/docs/vs-jackson.txt b/extensions/valueserialization-jackson/src/docs/vs-jackson.txt
index 898a8d7..ee7b4f2 100644
--- a/extensions/valueserialization-jackson/src/docs/vs-jackson.txt
+++ b/extensions/valueserialization-jackson/src/docs/vs-jackson.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/valueserialization-jackson/src/test/java/org/qi4j/valueserialization/jackson/JacksonPlainValueSerializationTest.java
+source=extensions/valueserialization-jackson/src/test/java/org/apache/zest/valueserialization/jackson/JacksonPlainValueSerializationTest.java
tag=assembly
----
diff --git a/extensions/valueserialization-orgjson/src/docs/vs-orgjson.txt b/extensions/valueserialization-orgjson/src/docs/vs-orgjson.txt
index a893ac0..b307f15 100644
--- a/extensions/valueserialization-orgjson/src/docs/vs-orgjson.txt
+++ b/extensions/valueserialization-orgjson/src/docs/vs-orgjson.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/valueserialization-orgjson/src/test/java/org/qi4j/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java
+source=extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java
tag=assembly
----
diff --git a/extensions/valueserialization-stax/src/docs/vs-stax.txt b/extensions/valueserialization-stax/src/docs/vs-stax.txt
index 7302a47..b65df68 100644
--- a/extensions/valueserialization-stax/src/docs/vs-stax.txt
+++ b/extensions/valueserialization-stax/src/docs/vs-stax.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=extensions/valueserialization-stax/src/test/java/org/qi4j/valueserialization/stax/StaxPlainValueSerializationTest.java
+source=extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java
tag=assembly
----
diff --git a/libraries/alarm/src/docs/alarm.txt b/libraries/alarm/src/docs/alarm.txt
index c0c7a59..0147289 100644
--- a/libraries/alarm/src/docs/alarm.txt
+++ b/libraries/alarm/src/docs/alarm.txt
@@ -73,7 +73,7 @@
[snippet,java]
--------------
-source=libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmProxyTest.java
+source=libraries/alarm/src/test/java/org/apache/zest/library/alarm/AlarmProxyTest.java
tag=documentation
--------------
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/Browser.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/Browser.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/BrowserException.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/BrowserException.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/BrowserException.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/BrowserException.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/Formatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Formatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/Formatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Formatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/FormatterFactory.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/FormatterFactory.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/FormatterFactory.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/FormatterFactory.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/AbstractJsonFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/AbstractJsonFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/AbstractJsonFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/AbstractJsonFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ApplicationModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ApplicationModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ApplicationModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ApplicationModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ArrayFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ArrayFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ArrayFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ArrayFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/CompositeMethodModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/CompositeMethodModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/CompositeMethodModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/CompositeMethodModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ConstructorModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ConstructorModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ConstructorModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ConstructorModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/EntityModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/EntityModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/EntityModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/EntityModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/InjectedFieldModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/InjectedFieldModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/InjectedFieldModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/InjectedFieldModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/JsonFormatterFactory.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/JsonFormatterFactory.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/JsonFormatterFactory.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/JsonFormatterFactory.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/LayerModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/LayerModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/LayerModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/LayerModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/MixinModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/MixinModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/MixinModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/MixinModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ModuleModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ModuleModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ModuleModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ModuleModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/NullFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/NullFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/NullFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/NullFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ObjectModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ObjectModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ObjectModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ObjectModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ServiceModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ServiceModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ServiceModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ServiceModelFormatter.java
diff --git a/libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ValueModelFormatter.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ValueModelFormatter.java
similarity index 100%
rename from libraries/appbrowser/src/main/java/org/qi4j/library/appbrowser/json/ValueModelFormatter.java
rename to libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/json/ValueModelFormatter.java
diff --git a/libraries/appbrowser/src/test/java/org/qi4j/library/appbrowser/AppBrowserTest.java b/libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java
similarity index 100%
rename from libraries/appbrowser/src/test/java/org/qi4j/library/appbrowser/AppBrowserTest.java
rename to libraries/appbrowser/src/test/java/org/apache/zest/library/appbrowser/AppBrowserTest.java
diff --git a/libraries/circuitbreaker/src/docs/circuitbreaker.txt b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
index 6706bd5..21aada2 100644
--- a/libraries/circuitbreaker/src/docs/circuitbreaker.txt
+++ b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
@@ -70,7 +70,7 @@
[snippet,java]
----
-source=libraries/circuitbreaker/src/test/java/org/qi4j/library/circuitbreaker/CircuitBreakerTest.java
+source=libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java
tag=direct
----
@@ -88,7 +88,7 @@
[snippet,java]
----
-source=libraries/circuitbreaker/src/test/java/org/qi4j/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
+source=libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
tag=service
----
@@ -106,7 +106,7 @@
[snippet,java]
----
-source=libraries/circuitbreaker/src/test/java/org/qi4j/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
+source=libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/jmx/CircuitBreakerManagementSample.java
tag=jmx
----
diff --git a/libraries/constraints/src/docs/constraints.txt b/libraries/constraints/src/docs/constraints.txt
index c358f75..8baaf0c 100644
--- a/libraries/constraints/src/docs/constraints.txt
+++ b/libraries/constraints/src/docs/constraints.txt
@@ -41,7 +41,7 @@
[snippet,java]
----
-source=libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java
+source=libraries/constraints/src/test/java/org/apache/zest/library/constraints/TestCaseComposite.java
tag=constraints
----
diff --git a/libraries/conversion/src/docs/conversion.txt b/libraries/conversion/src/docs/conversion.txt
index 015f3e6..a8eb3cf 100644
--- a/libraries/conversion/src/docs/conversion.txt
+++ b/libraries/conversion/src/docs/conversion.txt
@@ -45,7 +45,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/EntityToValueTest.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java
tag=assembly
----
@@ -53,7 +53,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/TestModel.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/TestModel.java
tag=state
----
@@ -61,7 +61,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/TestModel.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/TestModel.java
tag=entity
----
@@ -69,7 +69,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/TestModel.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/TestModel.java
tag=value
----
@@ -77,7 +77,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/EntityToValueTest.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/EntityToValueTest.java
tag=conversion
----
@@ -89,7 +89,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/ValueToEntityTest.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java
tag=assembly
----
@@ -99,7 +99,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/ValueToEntityTest.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java
tag=creation
----
@@ -107,7 +107,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/ValueToEntityTest.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/ValueToEntityTest.java
tag=update
----
@@ -123,7 +123,7 @@
[snippet,java]
----
-source=libraries/conversion/src/test/java/org/qi4j/library/conversion/values/TestModel.java
+source=libraries/conversion/src/test/java/org/apache/zest/library/conversion/values/TestModel.java
tag=unqualified
----
diff --git a/libraries/eventsourcing/src/docs/eventsourcing.txt b/libraries/eventsourcing/src/docs/eventsourcing.txt
index 6936ea5..882eee1 100644
--- a/libraries/eventsourcing/src/docs/eventsourcing.txt
+++ b/libraries/eventsourcing/src/docs/eventsourcing.txt
@@ -72,14 +72,14 @@
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/application/ApplicationEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java
tag=assemblyAE
----
Configure application events store:
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/application/ApplicationEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java
tag=storeAE
----
@@ -88,14 +88,14 @@
If it is not `null`, then the method call is a replay of previously created events.
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/application/ApplicationEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java
tag=methodAE
----
To enable execution capturing, you have to configure composite with concern:
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/application/ApplicationEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/application/ApplicationEventTest.java
tag=concernAE
----
@@ -105,7 +105,7 @@
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/domain/DomainEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java
tag=assemblyDE
----
@@ -113,7 +113,7 @@
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/domain/DomainEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java
tag=storeDE
----
@@ -122,7 +122,7 @@
They may not fail or thrown exceptions:
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/domain/DomainEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java
tag=methodDE
----
@@ -130,6 +130,6 @@
[snippet,java]
----
-source=libraries/eventsourcing/src/test/java/org/qi4j/library/eventsourcing/domain/DomainEventTest.java
+source=libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/DomainEventTest.java
tag=concernDE
----
diff --git a/libraries/fileconfig/src/docs/fileconfig.txt b/libraries/fileconfig/src/docs/fileconfig.txt
index ac973e6..7520005 100644
--- a/libraries/fileconfig/src/docs/fileconfig.txt
+++ b/libraries/fileconfig/src/docs/fileconfig.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfiguration.java
+source=libraries/fileconfig/src/main/java/org/apache/zest/library/fileconfig/FileConfiguration.java
tag=fileconfig
----
@@ -43,13 +43,13 @@
[snippet,java]
----
-source=libraries/fileconfig/src/test/java/org/qi4j/library/fileconfig/FileConfigurationTest.java
+source=libraries/fileconfig/src/test/java/org/apache/zest/library/fileconfig/FileConfigurationTest.java
tag=simple
----
These will default to the platform settings, but can be overridden manually, either one-by-one or as a whole.
-You can override defaults by adding org.qi4j.library.fileconfig.FileConfiguration_OS.properties files to your
+You can override defaults by adding org.apache.zest.library.fileconfig.FileConfiguration_OS.properties files to your
classpath where OS is one of win, mac or unix.
You can also override all properties definitions at assembly time by setting a FileConfigurationOverride object
@@ -57,7 +57,7 @@
[snippet,java]
----
-source=libraries/fileconfig/src/test/java/org/qi4j/library/fileconfig/FileConfigurationTest.java
+source=libraries/fileconfig/src/test/java/org/apache/zest/library/fileconfig/FileConfigurationTest.java
tag=override
----
diff --git a/libraries/http/src/docs/http.txt b/libraries/http/src/docs/http.txt
index 7e4b904..1479e69 100644
--- a/libraries/http/src/docs/http.txt
+++ b/libraries/http/src/docs/http.txt
@@ -39,7 +39,7 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/FooServletContextListenerService.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java
tag=context-listener
----
@@ -49,7 +49,7 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/HelloWorldServletService.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java
tag=servletservice
----
@@ -59,7 +59,7 @@
[snippet,java]
----
-source=libraries/http/src/main/java/org/qi4j/library/http/UnitOfWorkFilterService.java
+source=libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java
tag=filterservice
----
@@ -71,7 +71,7 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/JettyServiceTest.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java
tag=assembly
----
@@ -84,7 +84,7 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/JettyJMXStatisticsTest.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java
tag=jmx
----
@@ -93,7 +93,7 @@
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
+See org.apache.zest.library.http.JettyConfiguration for a reference of all available
configuration properties.
== Secure Jetty Service ==
@@ -106,7 +106,7 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/SecureJettyServiceTest.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java
tag=assemblyssl
----
@@ -123,11 +123,11 @@
[snippet,java]
----
-source=libraries/http/src/test/java/org/qi4j/library/http/MutualSecureJettyServiceTest.java
+source=libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java
tag=config
----
-See org.qi4j.library.http.SecureJettyConfiguration for a reference of all available
+See org.apache.zest.library.http.SecureJettyConfiguration for a reference of all available
configuration properties.
diff --git a/libraries/invocation-cache/src/docs/invocation-cache.txt b/libraries/invocation-cache/src/docs/invocation-cache.txt
index e613c6b..c46581a 100644
--- a/libraries/invocation-cache/src/docs/invocation-cache.txt
+++ b/libraries/invocation-cache/src/docs/invocation-cache.txt
@@ -63,7 +63,7 @@
[snippet,java]
----
-source=libraries/invocation-cache/src/test/java/org/qi4j/library/invocationcache/DocumentationSupport.java
+source=libraries/invocation-cache/src/test/java/org/apache/zest/library/invocationcache/DocumentationSupport.java
tag=composite
----
@@ -73,7 +73,7 @@
[snippet,java]
----
-source=libraries/invocation-cache/src/test/java/org/qi4j/library/invocationcache/DocumentationSupport.java
+source=libraries/invocation-cache/src/test/java/org/apache/zest/library/invocationcache/DocumentationSupport.java
tag=assembly
----
diff --git a/libraries/jmx/src/docs/jmx.txt b/libraries/jmx/src/docs/jmx.txt
index b8421a4..5c17265 100644
--- a/libraries/jmx/src/docs/jmx.txt
+++ b/libraries/jmx/src/docs/jmx.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=libraries/jmx/src/test/java/org/qi4j/library/jmx/JMXTest.java
+source=libraries/jmx/src/test/java/org/apache/zest/library/jmx/JMXTest.java
tag=assembly
----
diff --git a/libraries/lang-groovy/src/docs/lang-groovy.txt b/libraries/lang-groovy/src/docs/lang-groovy.txt
index e5a006a..9b090ed 100644
--- a/libraries/lang-groovy/src/docs/lang-groovy.txt
+++ b/libraries/lang-groovy/src/docs/lang-groovy.txt
@@ -38,7 +38,7 @@
[snippet,java]
----
-source=libraries/lang-groovy/src/test/groovy/org/qi4j/lang/groovy/HelloSpeaker.java
+source=libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeaker.java
tag=speaker
----
@@ -52,7 +52,7 @@
.HelloSpeakerMixin.groovy
[snippet,groovy]
----
-source=libraries/lang-groovy/src/test/groovy/org/qi4j/lang/groovy/HelloSpeakerMixin.groovy
+source=libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
tag=direct
----
@@ -60,7 +60,7 @@
[snippet,java]
----
-source=libraries/lang-groovy/src/test/groovy/org/qi4j/lang/groovy/HelloSpeakerTest.java
+source=libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
tag=direct
----
@@ -72,7 +72,7 @@
.HelloSpeaker.groovy
[snippet,groovy]
----
-source=libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/HelloSpeaker.groovy
+source=libraries/lang-groovy/src/test/resources/org/apache/zest/lang/groovy/HelloSpeaker.groovy
tag=script
----
@@ -80,7 +80,7 @@
[snippet,java]
----
-source=libraries/lang-groovy/src/test/groovy/org/qi4j/lang/groovy/HelloSpeakerTest.java
+source=libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
tag=script
----
@@ -94,7 +94,7 @@
.HelloSpeaker.sayHello.groovy
[snippet,groovy]
----
-source=libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/HelloSpeaker.sayHello.groovy
+source=libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy
tag=script
----
@@ -102,7 +102,7 @@
[snippet,java]
----
-source=libraries/lang-groovy/src/test/groovy/org/qi4j/lang/groovy/HelloSpeakerTest.java
+source=libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
tag=script
----
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
index b360211..1e85ecb 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
@@ -18,7 +18,7 @@
package org.apache.zest.library.groovy;
// START SNIPPET: direct
-public class HelloSpeakerMixin implements HelloSpeaker {
+public class HelloSpeakerMixin implements org.apache.zest.library.groovy.support.HelloSpeaker {
public String sayHello( String name ) {
"Hello $name!"
}
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
index 6b43495..defe29a 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
@@ -29,13 +29,13 @@
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.transients( HelloSpeaker.class ).withMixins( GroovyMixin.class );
+ module.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( GroovyMixin.class );
}
@Test
public void testHello()
{
- HelloSpeaker speaker = module.newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = module.newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
}
@@ -50,10 +50,10 @@
public void assemble( ModuleAssembly assembly )
throws AssemblyException
{
- assembly.transients( HelloSpeaker.class ).withMixins( GroovyMixin.class );
+ assembly.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( GroovyMixin.class );
}
};
- HelloSpeaker speaker = assembler.module().newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = assembler.module().newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
// END SNIPPET: script
}
@@ -69,10 +69,10 @@
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.transients( HelloSpeaker.class ).withMixins( HelloSpeakerMixin.class );
+ module.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( HelloSpeakerMixin.class );
}
};
- HelloSpeaker speaker = assembler.module().newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = assembler.module().newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
// END SNIPPET: direct
}
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
similarity index 93%
rename from libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy
rename to libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
index 00cc5a3..69e1bd1 100644
--- a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy
+++ b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
@@ -1,4 +1,4 @@
-package org.apache.zest.library.groovy
+package org.apache.zest.library.groovy.support
/*
* Copyright (c) 2015 the original author or authors
*
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
similarity index 93%
rename from libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy
rename to libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
index f7ca097..3e985d9 100644
--- a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy
+++ b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
@@ -1,4 +1,4 @@
-package org.apache.zest.library.groovy
+package org.apache.zest.library.groovy.support
/*
* Copyright 2007 Rickard Öberg
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libraries/lang-javascript/src/docs/lang-javascript.txt b/libraries/lang-javascript/src/docs/lang-javascript.txt
index ddd52e2..542b64c 100644
--- a/libraries/lang-javascript/src/docs/lang-javascript.txt
+++ b/libraries/lang-javascript/src/docs/lang-javascript.txt
@@ -37,7 +37,7 @@
Example:
- org/qi4j/samples/hello/domain/HelloWorldSpeaker.say.js
+ org/apache/zest/samples/hello/domain/HelloWorldSpeaker.say.js
That means that the HelloWorldSpeaker.say.js file may be co-located with the
class files in the same package. It is currently not supported to place the
@@ -50,6 +50,6 @@
[snippet,java]
----
-source=libraries/lang-javascript/src/test/java/org/qi4j/lang/javascript/HelloSpeaker.java
+source=libraries/lang-javascript/src/test/java/org/apache/zest/library/javascript/HelloSpeaker.java
tag=mixin
----
diff --git a/libraries/lang-jruby/README.txt b/libraries/lang-jruby/README.txt
index 3b2dcf5..fb53980 100644
--- a/libraries/lang-jruby/README.txt
+++ b/libraries/lang-jruby/README.txt
@@ -2,7 +2,7 @@
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
diff --git a/libraries/lang-scala/src/docs/lang-scala.txt b/libraries/lang-scala/src/docs/lang-scala.txt
index c4b3a8f..725d4da 100644
--- a/libraries/lang-scala/src/docs/lang-scala.txt
+++ b/libraries/lang-scala/src/docs/lang-scala.txt
@@ -37,28 +37,28 @@
Example mixin declaration:
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin2.scala
tag=mixin
----
Example composite declaration:
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite.scala
tag=composite
----
Example typed concern:
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloThereConcern.scala
tag=typedconcern
----
Example generic concern with filter:
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/ExclamationGenericConcern.scala
tag=genericconcern
----
@@ -66,7 +66,7 @@
Note that the `ScalaTraitMixin` must be added.
[snippet,java]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
tag=composite
----
@@ -81,7 +81,7 @@
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestEntity.scala
tag=entity
----
@@ -93,7 +93,7 @@
[snippet,java]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
tag=entity
----
@@ -104,7 +104,7 @@
[snippet,scala]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestService.scala
tag=service
----
@@ -112,6 +112,6 @@
[snippet,java]
----
-source=libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java
+source=libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
tag=service
----
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/ExclamationGenericConcern.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/ExclamationGenericConcern.scala
similarity index 96%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/ExclamationGenericConcern.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/ExclamationGenericConcern.scala
index a836426..9328122 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/ExclamationGenericConcern.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/ExclamationGenericConcern.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import java.lang.reflect.Method
import org.apache.zest.api.concern.GenericConcern
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloThereConcern.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloThereConcern.scala
similarity index 94%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloThereConcern.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloThereConcern.scala
index 7786212..81c4663 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloThereConcern.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloThereConcern.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import org.apache.zest.api.concern.ConcernOf
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite.scala
similarity index 95%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite.scala
index 5b2a940..a8ac925 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import org.apache.zest.api.composite.TransientComposite
import org.apache.zest.api.concern.Concerns
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite2.scala
similarity index 93%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite2.scala
index 782baba..9a7c71c 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldComposite2.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
trait HelloWorldComposite2
extends HelloWorldComposite with HelloWorldMixin3
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
similarity index 97%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
index 47f3c8c..a01b870 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala;
+package org.apache.zest.library.scala;
import org.junit.Assert;
import org.junit.Test;
@@ -19,7 +19,6 @@
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.SingletonAssembler;
import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler;
-import org.apache.zest.library.scala.ScalaTraitMixin;
import org.apache.zest.spi.query.IndexExporter;
import org.apache.zest.test.EntityTestAssembler;
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin.scala
similarity index 93%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin.scala
index de17b11..cf62e8c 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
trait HelloWorldMixin
{
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin2.scala
similarity index 94%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin2.scala
index c22c148..6e176fc 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin2.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import org.apache.zest.library.constraints.annotation.MaxLength
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin3.scala
similarity index 93%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin3.scala
index 11df519..118c4fd 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldMixin3.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
/**
* TODO
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestEntity.scala
similarity index 97%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestEntity.scala
index 63b4225..426bf58 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestEntity.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import org.apache.zest.api.entity.EntityComposite
import org.apache.zest.api.injection.scope.Service
diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestService.scala
similarity index 94%
rename from libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala
rename to libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestService.scala
index 7e62d3a..6d66a30 100644
--- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala
+++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/TestService.scala
@@ -9,7 +9,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.zest.library.scala.scala
+package org.apache.zest.library.scala
import org.apache.zest.api.service.ServiceComposite
diff --git a/libraries/locking/src/docs/locking.txt b/libraries/locking/src/docs/locking.txt
index 6f1f9ee..bebce16 100644
--- a/libraries/locking/src/docs/locking.txt
+++ b/libraries/locking/src/docs/locking.txt
@@ -61,7 +61,7 @@
[snippet,java]
----
-source=libraries/locking/src/test/java/org/qi4j/library/locking/DocumentationSupport.java
+source=libraries/locking/src/test/java/org/apache/zest/library/locking/DocumentationSupport.java
tag=assembly
----
diff --git a/libraries/logging/src/docs/logging.txt b/libraries/logging/src/docs/logging.txt
index ed7f6b6..ff6820a 100644
--- a/libraries/logging/src/docs/logging.txt
+++ b/libraries/logging/src/docs/logging.txt
@@ -58,7 +58,7 @@
[snippet,java]
-----------
-source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java
+source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java
tag=logging1
-----------
@@ -66,7 +66,7 @@
[snippet,java]
-----------
-source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java
+source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java
tag=logging2
-----------
@@ -90,7 +90,7 @@
[snippet,java]
-----------
-source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java
+source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java
tag=logging3
-----------
@@ -107,6 +107,6 @@
[snippet,java]
-----------
-source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java
+source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java
tag=logging4
-----------
diff --git a/libraries/metrics/src/docs/metrics.txt b/libraries/metrics/src/docs/metrics.txt
index 857c99a..616b409 100644
--- a/libraries/metrics/src/docs/metrics.txt
+++ b/libraries/metrics/src/docs/metrics.txt
@@ -47,7 +47,7 @@
[snippet,java]
----
-source=libraries/metrics/src/test/java/org/qi4j/library/metrics/DocumentationSupport.java
+source=libraries/metrics/src/test/java/org/apache/zest/library/metrics/DocumentationSupport.java
tag=capture
----
@@ -57,7 +57,7 @@
[snippet,java]
----
-source=libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java
+source=libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java
tag=complex-capture
----
diff --git a/libraries/osgi/src/docs/osgi.txt b/libraries/osgi/src/docs/osgi.txt
index 957bbfc..5c36457 100644
--- a/libraries/osgi/src/docs/osgi.txt
+++ b/libraries/osgi/src/docs/osgi.txt
@@ -34,7 +34,7 @@
[snippet,java]
----
-source=libraries/osgi/src/test/java/org/qi4j/library/osgi/DocumentationSupport.java
+source=libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java
tag=export
----
@@ -43,7 +43,7 @@
[snippet,java]
----
-source=libraries/osgi/src/test/java/org/qi4j/library/osgi/DocumentationSupport.java
+source=libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java
tag=import
----
diff --git a/libraries/rest-client/src/docs/primer.txt b/libraries/rest-client/src/docs/primer.txt
index 62245bd..d87fc95 100644
--- a/libraries/rest-client/src/docs/primer.txt
+++ b/libraries/rest-client/src/docs/primer.txt
@@ -51,7 +51,7 @@
Example:
[snippet,java]
-----------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/docsupport/RestPrimerDocs.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/docsupport/RestPrimerDocs.java
tag=1
-----------
@@ -68,7 +68,7 @@
[snippet,java]
-----------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/docsupport/RestPrimerDocs.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/docsupport/RestPrimerDocs.java
tag=2
-----------
diff --git a/libraries/rest-client/src/docs/rest-client.txt b/libraries/rest-client/src/docs/rest-client.txt
index dafd6db..a783281 100644
--- a/libraries/rest-client/src/docs/rest-client.txt
+++ b/libraries/rest-client/src/docs/rest-client.txt
@@ -46,7 +46,7 @@
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=client-create1
-------------
@@ -57,7 +57,7 @@
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=client-create2
-------------
@@ -74,7 +74,7 @@
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=client-create3
-------------
@@ -89,28 +89,28 @@
=== Query without Value ===
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=query-without-value
-------------
=== Query and Command ===
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=query-and-command
-------------
=== Query List and Command ===
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=query-list-and-command
-------------
=== Query List and Command Progressive ===
[snippet,java]
-------------
-source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java
+source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
tag=query-list-and-command-progressive
-------------
diff --git a/libraries/scheduler/src/docs/scheduler.txt b/libraries/scheduler/src/docs/scheduler.txt
index 142907a..2a42cbe 100644
--- a/libraries/scheduler/src/docs/scheduler.txt
+++ b/libraries/scheduler/src/docs/scheduler.txt
@@ -33,7 +33,7 @@
== Logging ==
-The SLF4J Logger used by this library is named "org.qi4j.library.scheduler".
+The SLF4J Logger used by this library is named "org.apache.zest.library.scheduler".
== Assembly ==
@@ -45,7 +45,7 @@
[snippet,java]
----
-source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/SchedulerTest.java
+source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/SchedulerTest.java
tag=assembly
----
@@ -55,7 +55,7 @@
[snippet,java]
----
-source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerConfiguration.java
+source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/SchedulerConfiguration.java
tag=configuration
----
@@ -67,7 +67,7 @@
[snippet,java]
----
-source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/Task.java
+source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/Task.java
tag=task
----
@@ -82,7 +82,7 @@
[snippet,java]
-----------
-source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java
+source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java
tag=1
-----------
@@ -104,7 +104,7 @@
[snippet,java]
-----------
-source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java
+source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java
tag=2
-----------
@@ -154,7 +154,7 @@
[snippet,java]
-----------
-source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java
+source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java
tag=timeline
-----------
@@ -162,7 +162,7 @@
[snippet,java]
----
-source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/timeline/Timeline.java
+source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/timeline/Timeline.java
tag=timeline
----
diff --git a/libraries/servlet/src/docs/servlet.txt b/libraries/servlet/src/docs/servlet.txt
index 4af90c1..763a47a 100644
--- a/libraries/servlet/src/docs/servlet.txt
+++ b/libraries/servlet/src/docs/servlet.txt
@@ -44,7 +44,7 @@
[snippet,java]
----
-source=libraries/servlet/src/test/java/org/qi4j/library/servlet/ServletTest.java
+source=libraries/servlet/src/test/java/org/apache/zest/library/servlet/ServletTest.java
tag=bootstrap
----
@@ -58,12 +58,12 @@
[snippet,java]
----
-source=libraries/servlet/src/test/java/org/qi4j/library/servlet/ServletTest.java
+source=libraries/servlet/src/test/java/org/apache/zest/library/servlet/ServletTest.java
tag=usage
----
== Logging ==
-The SLF4J logger used by this library is named "org.qi4j.library.servlet".
+The SLF4J logger used by this library is named "org.apache.zest.library.servlet".
diff --git a/libraries/shiro-core/src/docs/shiro.txt b/libraries/shiro-core/src/docs/shiro.txt
index a12a3e7..c108bac 100644
--- a/libraries/shiro-core/src/docs/shiro.txt
+++ b/libraries/shiro-core/src/docs/shiro.txt
@@ -53,7 +53,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java
tag=before
----
@@ -64,7 +64,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java
tag=assembly
----
@@ -72,7 +72,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/main/java/org/qi4j/library/shiro/ini/ShiroIniConfiguration.java
+source=libraries/shiro-core/src/main/java/org/apache/zest/library/shiro/ini/ShiroIniConfiguration.java
tag=config
----
@@ -85,7 +85,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java
tag=thread-context
----
@@ -126,7 +126,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/RealmServiceTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/RealmServiceTest.java
tag=realm-service
----
@@ -164,7 +164,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java
tag=domain
----
@@ -173,7 +173,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java
tag=assembly
----
@@ -181,7 +181,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java
tag=usage
----
@@ -190,7 +190,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/main/java/org/qi4j/library/shiro/domain/passwords/PasswordRealmConfiguration.java
+source=libraries/shiro-core/src/main/java/org/apache/zest/library/shiro/domain/passwords/PasswordRealmConfiguration.java
tag=config
----
@@ -206,7 +206,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java
tag=domain
----
@@ -214,7 +214,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java
tag=assembly
----
@@ -222,7 +222,7 @@
[snippet,java]
----
-source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java
+source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java
tag=usage
----
@@ -241,4 +241,4 @@
== Logging ==
-All code from this library use the `org.qi4j.library.shiro` logger.
+All code from this library use the `org.apache.zest.library.shiro` logger.
diff --git a/libraries/shiro-web/src/docs/shiro-web.txt b/libraries/shiro-web/src/docs/shiro-web.txt
index c92d9b8..d798752 100644
--- a/libraries/shiro-web/src/docs/shiro-web.txt
+++ b/libraries/shiro-web/src/docs/shiro-web.txt
@@ -53,7 +53,7 @@
[snippet,java]
----
-source=libraries/shiro-web/src/test/java/org/qi4j/library/shiro/web/WebHttpShiroTest.java
+source=libraries/shiro-web/src/test/java/org/apache/zest/library/shiro/web/WebHttpShiroTest.java
tag=assembly
----
diff --git a/libraries/spring/src/docs/spring.txt b/libraries/spring/src/docs/spring.txt
index 12ec47e..9c2caa4 100644
--- a/libraries/spring/src/docs/spring.txt
+++ b/libraries/spring/src/docs/spring.txt
@@ -38,7 +38,7 @@
[snippet,java]
----
-source=libraries/spring/src/test/java/org/qi4j/library/spring/importer/Qi4jImportServiceTest.java
+source=libraries/spring/src/test/java/org/apache/zest/library/spring/importer/Qi4jImportServiceTest.java
tag=import
----
@@ -47,15 +47,15 @@
Steps to export Zest™ service:
- 1. Create spring BeanFactory service of qi4j services to export.
+ 1. Create spring BeanFactory service of Zest services to export.
2. Create a class that extends Qi4jApplicationBootstrap.
3. Sets the layer and module that register BeanFactory service.
- 4. Assemble qi4j application by implementing #assemble method.
+ 4. Assemble Zest application by implementing #assemble method.
5. Sets the identity of bean factory service. This identity is the spring bean name.
- 6. Declare qi4j bootstrap in spring xml application context.
+ 6. Declare Zest bootstrap in spring xml application context.
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.apache.zest.library.spring.bootstrap.Qi4jApplicationBootstrap+ and implement the
+org.springframework.context.ApplicationContextAware+.
A new bean will appear in the application context, called +"qi4jApplication"+ which is only
@@ -86,6 +86,6 @@
[snippet,java]
----
-source=libraries/spring/src/test/java/org/qi4j/library/spring/MyZestBootstrapper.java
+source=libraries/spring/src/test/java/org/apache/zest/library/spring/MyZestBootstrapper.java
tag=code
----
diff --git a/libraries/sql/src/docs/sql.txt b/libraries/sql/src/docs/sql.txt
index ffad172..76f1e24 100644
--- a/libraries/sql/src/docs/sql.txt
+++ b/libraries/sql/src/docs/sql.txt
@@ -69,7 +69,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java
tag=bonecp
----
@@ -84,7 +84,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java
tag=dbcp
----
@@ -98,7 +98,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java
tag=datasource
----
@@ -111,7 +111,7 @@
[snippet,java]
----
-source=libraries/sql/src/main/java/org/qi4j/library/sql/datasource/DataSourceConfigurationState.java
+source=libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationState.java
tag=config
----
@@ -131,7 +131,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/datasource/ExternalDataSourceTest.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java
tag=assembly
----
@@ -149,7 +149,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java
tag=cb-assembly
----
@@ -158,7 +158,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java
tag=cb-datasource
----
@@ -171,7 +171,7 @@
[snippet,java]
----
-source=libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java
+source=libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java
tag=io
----
@@ -184,7 +184,7 @@
[snippet,java]
----
-source=libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java
+source=libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java
tag=jmx
----
@@ -212,7 +212,7 @@
[snippet,java]
----
-source=libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java
+source=libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java
tag=assembly
----
@@ -223,7 +223,7 @@
[snippet,java]
----
-source=libraries/sql-liquibase/src/main/java/org/qi4j/library/sql/liquibase/LiquibaseConfiguration.java
+source=libraries/sql-liquibase/src/main/java/org/apache/zest/library/sql/liquibase/LiquibaseConfiguration.java
tag=config
----
diff --git a/libraries/uid/src/docs/uid.txt b/libraries/uid/src/docs/uid.txt
index 710b606..84d2e13 100644
--- a/libraries/uid/src/docs/uid.txt
+++ b/libraries/uid/src/docs/uid.txt
@@ -35,7 +35,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=uuid-assembly
----
@@ -43,7 +43,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=uuid-usage
----
@@ -64,7 +64,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=seq-assembly
----
@@ -72,7 +72,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=seq-usage
----
@@ -82,7 +82,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=perseq-assembly
----
@@ -90,7 +90,7 @@
[snippet,java]
----
-source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java
+source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java
tag=seq-usage
----
diff --git a/libraries/uowfile/src/docs/uowfile.txt b/libraries/uowfile/src/docs/uowfile.txt
index b3a1c00..8069a37 100644
--- a/libraries/uowfile/src/docs/uowfile.txt
+++ b/libraries/uowfile/src/docs/uowfile.txt
@@ -43,7 +43,7 @@
== Logging ==
-The SLF4J Logger used by this library is named "org.qi4j.library.uowfile".
+The SLF4J Logger used by this library is named "org.apache.zest.library.uowfile".
== Add an attached file to an Entity ==
@@ -52,7 +52,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
tag=entity
----
@@ -60,7 +60,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
tag=uowfile
----
@@ -68,7 +68,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/main/java/org/qi4j/library/uowfile/singular/HasUoWFile.java
+source=libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/singular/HasUoWFile.java
tag=contract
----
@@ -76,7 +76,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
tag=locator
----
@@ -84,7 +84,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
tag=assembly
----
@@ -92,7 +92,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
tag=api
----
@@ -106,7 +106,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
tag=entity
----
@@ -118,7 +118,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
tag=uowfile
----
@@ -126,7 +126,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/main/java/org/qi4j/library/uowfile/plural/HasUoWFiles.java
+source=libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/plural/HasUoWFiles.java
tag=contract
----
@@ -134,7 +134,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
tag=locator
----
@@ -142,7 +142,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
tag=assembly
----
@@ -150,7 +150,7 @@
[snippet,java]
----
-source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java
+source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
tag=api
----
diff --git a/manual/src/docs/tutorials/howto-assembly-application.txt b/manual/src/docs/tutorials/howto-assembly-application.txt
index 05e2ad7..c2b17c3 100644
--- a/manual/src/docs/tutorials/howto-assembly-application.txt
+++ b/manual/src/docs/tutorials/howto-assembly-application.txt
@@ -70,7 +70,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Docs.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Docs.java
tag=direct
-----------
@@ -78,7 +78,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Docs.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Docs.java
tag=indirect
-----------
@@ -122,7 +122,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
tag=main
-----------
@@ -135,7 +135,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
tag=domainLayer
-----------
@@ -145,7 +145,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
tag=accountModule
-----------
@@ -154,7 +154,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
tag=shutdown
-----------
diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt
index ab2d3fa..f75999d 100644
--- a/manual/src/docs/tutorials/howto-build-system.txt
+++ b/manual/src/docs/tutorials/howto-build-system.txt
@@ -165,7 +165,7 @@
[source,bash]
-----------
-./gradlew :org.qi4j.tests:org.qi4j.test.performance:testPerf
+./gradlew :org.apache.zest.tests:org.apache.zest.test.performance:testPerf
-----------
Results will then be available in the test reports.
diff --git a/manual/src/docs/tutorials/howto-configure-service.txt b/manual/src/docs/tutorials/howto-configure-service.txt
index 86751b5..6f70d45 100644
--- a/manual/src/docs/tutorials/howto-configure-service.txt
+++ b/manual/src/docs/tutorials/howto-configure-service.txt
@@ -34,7 +34,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlan.java
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlan.java
tag=service
-----------
@@ -42,7 +42,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanService.java
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanService.java
tag=serviceComposite
-----------
@@ -52,7 +52,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanConfiguration.java
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanConfiguration.java
tag=configuration
-----------
@@ -63,7 +63,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanMixin.java
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanMixin.java
tag=mixin
-----------
@@ -74,7 +74,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanMixin.java
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanMixin.java
tag=refresh
-----------
@@ -95,7 +95,7 @@
[snippet,bash]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanService.properties
+source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanService.properties
tag=params
-----------
File: org/hedhman/niclas/travel/TravelPlanService.properties
@@ -106,7 +106,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/Main.java
+source=manual/src/main/java/org/apache/zest/manual/travel/Main.java
tag=simple
-----------
@@ -117,7 +117,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/Main.java
+source=manual/src/main/java/org/apache/zest/manual/travel/Main.java
tag=assemble
-----------
@@ -125,18 +125,18 @@
[snippet,bash]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/ExpediaService.properties
+source=manual/src/main/java/org/apache/zest/manual/travel/ExpediaService.properties
tag=params
-----------
-File: org/qi4j/manual/travel/ExpediaService.properties
+File: org/apache/zest/manual/travel/ExpediaService.properties
[snippet,bash]
-----------
-source=manual/src/main/java/org/qi4j/manual/travel/OrbitzService.properties
+source=manual/src/main/java/org/apache/zest/manual/travel/OrbitzService.properties
tag=params
-----------
-File: org/qi4j/manual/travel/OrbitzService.properties
+File: org/apache/zest/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
diff --git a/manual/src/docs/tutorials/howto-contextual-fragments.txt b/manual/src/docs/tutorials/howto-contextual-fragments.txt
index 1dc423c..09f71b9 100644
--- a/manual/src/docs/tutorials/howto-contextual-fragments.txt
+++ b/manual/src/docs/tutorials/howto-contextual-fragments.txt
@@ -35,7 +35,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/contextualFragments/TraceAll.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/contextualFragments/TraceAll.java
tag=assemble
-----------
diff --git a/manual/src/docs/tutorials/howto-create-concern.txt b/manual/src/docs/tutorials/howto-create-concern.txt
index a36ea99..94b0b6e 100644
--- a/manual/src/docs/tutorials/howto-create-concern.txt
+++ b/manual/src/docs/tutorials/howto-create-concern.txt
@@ -34,7 +34,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/InventoryConcern.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/InventoryConcern.java
tag=allClass
-----------
@@ -49,7 +49,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/Order.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/Order.java
tag=class
-----------
@@ -63,7 +63,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyGenericConcern.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyGenericConcern.java
tag=class
-----------
@@ -71,7 +71,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/AnyMixinType.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/AnyMixinType.java
tag=class
-----------
@@ -90,7 +90,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyGenericConcern.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyGenericConcern.java
tag=appliesTo
-----------
@@ -98,7 +98,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/AnyMixinType.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/AnyMixinType.java
tag=annotationUse
-----------
@@ -108,6 +108,6 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyAppliesToFilter.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyAppliesToFilter.java
tag=filter
-----------
diff --git a/manual/src/docs/tutorials/howto-create-constraint.txt b/manual/src/docs/tutorials/howto-create-constraint.txt
index 23dfab7..5d0630c 100644
--- a/manual/src/docs/tutorials/howto-create-constraint.txt
+++ b/manual/src/docs/tutorials/howto-create-constraint.txt
@@ -34,7 +34,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/Dialer.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/Dialer.java
tag=dialer
-----------
@@ -42,7 +42,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumber.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumber.java
tag=annotation
-----------
@@ -50,7 +50,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumberConstraint.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumberConstraint.java
tag=constraint
-----------
@@ -58,7 +58,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/DialerComposite.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/DialerComposite.java
tag=composite
-----------
@@ -67,7 +67,7 @@
[snippet,java]
----
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/ParameterViolationConcern.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/ParameterViolationConcern.java
tag=report
----
@@ -77,7 +77,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/HasPhoneNumber.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/HasPhoneNumber.java
tag=property
-----------
@@ -89,6 +89,6 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumberParameterViolationConcern.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumberParameterViolationConcern.java
tag=property
-----------
diff --git a/manual/src/docs/tutorials/howto-create-entity.txt b/manual/src/docs/tutorials/howto-create-entity.txt
index 41ffe94..7d2d04f 100644
--- a/manual/src/docs/tutorials/howto-create-entity.txt
+++ b/manual/src/docs/tutorials/howto-create-entity.txt
@@ -65,17 +65,17 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Car.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Car.java
tag=entity
-----------
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Manufacturer.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Manufacturer.java
tag=entity
-----------
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Accident.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Accident.java
tag=entity
-----------
@@ -90,17 +90,17 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntity.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntity.java
tag=composite
-----------
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerEntity.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerEntity.java
tag=composite
-----------
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/AccidentValue.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/AccidentValue.java
tag=composite
-----------
@@ -114,7 +114,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/MyAssembler.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/MyAssembler.java
tag=assembler1
-----------
@@ -130,7 +130,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactory.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactory.java
tag=carFactory
-----------
@@ -139,7 +139,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryService.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryService.java
tag=carFactoryService
-----------
@@ -147,7 +147,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
tag=carFactoryMixin1
-----------
@@ -159,7 +159,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
tag=carFactoryMixin2
-----------
@@ -168,7 +168,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
tag=carFactoryMixin3
-----------
@@ -179,7 +179,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
tag=create
-----------
@@ -191,7 +191,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepository.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepository.java
tag=repo
-----------
@@ -199,7 +199,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepositoryService.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepositoryService.java
tag=manufacturerRepositoryService
-----------
@@ -207,7 +207,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepositoryMixin.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepositoryMixin.java
tag=repo
-----------
@@ -216,7 +216,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/MyAssembler.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/MyAssembler.java
tag=assembler2
-----------
diff --git a/manual/src/docs/tutorials/howto-create-sideeffect.txt b/manual/src/docs/tutorials/howto-create-sideeffect.txt
index 2675168..19b7709 100644
--- a/manual/src/docs/tutorials/howto-create-sideeffect.txt
+++ b/manual/src/docs/tutorials/howto-create-sideeffect.txt
@@ -34,7 +34,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/MailNotifySideEffect.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/MailNotifySideEffect.java
tag=allClass
-----------
@@ -49,7 +49,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/OrderEntity.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/OrderEntity.java
tag=body
-----------
@@ -62,7 +62,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyGenericSideEffect.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyGenericSideEffect.java
tag=body
-----------
@@ -70,7 +70,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/AnyMixinType.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/AnyMixinType.java
tag=body
-----------
@@ -90,7 +90,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyGenericSideEffect.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyGenericSideEffect.java
tag=appliesTo
-----------
@@ -98,7 +98,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/AnyMixinType.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/AnyMixinType.java
tag=annotation
-----------
@@ -108,7 +108,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyAppliesToFilter.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyAppliesToFilter.java
tag=filter
-----------
diff --git a/manual/src/docs/tutorials/howto-depend-on-zest.txt b/manual/src/docs/tutorials/howto-depend-on-zest.txt
index 1d0b629..1c7ec19 100644
--- a/manual/src/docs/tutorials/howto-depend-on-zest.txt
+++ b/manual/src/docs/tutorials/howto-depend-on-zest.txt
@@ -48,19 +48,19 @@
----
<dependencies>
<dependency>
- <groupId>org.qi4j.core</groupId>
- <artifactId>org.qi4j.core.bootstrap</artifactId>
+ <groupId>org.apache.zest.core</groupId>
+ <artifactId>org.apache.zest.core.bootstrap</artifactId>
<version>ZEST_VERSION</version>
</dependency>
<dependency>
- <groupId>org.qi4j.core</groupId>
- <artifactId>org.qi4j.core.runtime</artifactId>
+ <groupId>org.apache.zest.core</groupId>
+ <artifactId>org.apache.zest.core.runtime</artifactId>
<version>ZEST_VERSION</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.qi4j.core</groupId>
- <artifactId>org.qi4j.core.testsupport</artifactId>
+ <groupId>org.apache.zest.core</groupId>
+ <artifactId>org.apache.zest.core.testsupport</artifactId>
<version>ZEST_VERSION</version>
<scope>test</scope>
</dependency>
@@ -91,9 +91,9 @@
[source,groovy]
----
dependencies {
- compile "org.qi4j.core:org.qi4j.core.bootstrap:ZEST_VERSION"
- runtime "org.qi4j.core:org.qi4j.core.runtime:ZEST_VERSION"
- testCompile "org.qi4j.core:org.qi4j.core.testsupport:ZEST_VERSION"
+ compile "org.apache.zest.core:org.apache.zest.core.bootstrap:ZEST_VERSION"
+ runtime "org.apache.zest.core:org.apache.zest.core.runtime:ZEST_VERSION"
+ testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:ZEST_VERSION"
}
----
@@ -115,9 +115,9 @@
[source,ruby]
----
-compile.with 'org.qi4j.core:org.qi4j.core.bootstrap:ZEST_VERSION'
-package(:war).with :libs => 'org.qi4j.core:org.qi4j.core.runtime:ZEST_VERSION'
-test.with 'org.qi4j.core:org.qi4j.core.testsupport:ZEST_VERSION'
+compile.with 'org.apache.zest.core:org.apache.zest.core.bootstrap:ZEST_VERSION'
+package(:war).with :libs => 'org.apache.zest.core:org.apache.zest.core.runtime:ZEST_VERSION'
+test.with 'org.apache.zest.core:org.apache.zest.core.testsupport:ZEST_VERSION'
----
Where `ZEST_VERSION` is the Zest™ version you want to use.
@@ -137,13 +137,13 @@
[source,scala]
----
libraryDependencies += \
- "org.qi4j.core" % "org.qi4j.core.bootstrap" % "ZEST_VERSION" \
+ "org.apache.zest.core" % "org.apache.zest.core.bootstrap" % "ZEST_VERSION" \
withSources() withJavadoc()
libraryDependencies += \
- "org.qi4j.core" % "org.qi4j.core.runtime" % "ZEST_VERSION" % "runtime" \
+ "org.apache.zest.core" % "org.apache.zest.core.runtime" % "ZEST_VERSION" % "runtime" \
withSources() withJavadoc()
libraryDependencies += \
- "org.qi4j.core" % "org.qi4j.core.testsupport" % "ZEST_VERSION" % "test" \
+ "org.apache.zest.core" % "org.apache.zest.core.testsupport" % "ZEST_VERSION" % "test" \
withSources() withJavadoc()
----
@@ -165,11 +165,11 @@
----
<ivy-module>
<dependencies>
- <dependency org="org.qi4j.core" name="org.qi4j.core.bootstrap"
+ <dependency org="org.apache.zest.core" name="org.apache.zest.core.bootstrap"
rev="ZEST_VERSION" conf="default" />
- <dependency org="org.qi4j.core" name="org.qi4j.core.runtime"
+ <dependency org="org.apache.zest.core" name="org.apache.zest.core.runtime"
rev="ZEST_VERSION" conf="runtime" />
- <dependency org="org.qi4j.core" name="org.qi4j.core.testsupport"
+ <dependency org="org.apache.zest.core" name="org.apache.zest.core.testsupport"
rev="ZEST_VERSION" conf="test" />
</dependencies>
</ivy-module>
diff --git a/manual/src/docs/tutorials/howto-invocation-annotation.txt b/manual/src/docs/tutorials/howto-invocation-annotation.txt
index 200ed44..4e13b68 100644
--- a/manual/src/docs/tutorials/howto-invocation-annotation.txt
+++ b/manual/src/docs/tutorials/howto-invocation-annotation.txt
@@ -53,7 +53,7 @@
[snippet,java]
-----------
-source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java
+source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java
tag=annotation
-----------
@@ -61,7 +61,7 @@
[snippet,java]
-----------
-source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java
+source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java
tag=declaration
-----------
@@ -69,7 +69,7 @@
[snippet,java]
-----------
-source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java
+source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java
tag=use1
-----------
diff --git a/manual/src/docs/tutorials/howto-leverage-properties.txt b/manual/src/docs/tutorials/howto-leverage-properties.txt
index 1934f8c..cc9691a 100644
--- a/manual/src/docs/tutorials/howto-leverage-properties.txt
+++ b/manual/src/docs/tutorials/howto-leverage-properties.txt
@@ -30,13 +30,13 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/pojo/Book.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/pojo/Book.java
tag=book
-----------
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/pojo/MutableBook.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/pojo/MutableBook.java
tag=mutableBook
-----------
@@ -51,7 +51,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/Book.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/Book.java
tag=book
-----------
@@ -64,7 +64,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/BookFactory.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/BookFactory.java
tag=create
-----------
@@ -87,7 +87,7 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/SwingInfo.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingInfo.java
tag=info
-----------
@@ -95,6 +95,6 @@
[snippet,java]
-----------
-source=manual/src/main/java/org/qi4j/manual/recipes/properties/SwingPanel.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java
tag=info-use
-----------
diff --git a/manual/src/docs/tutorials/howto-releasing-apache.txt b/manual/src/docs/tutorials/howto-releasing-apache.txt
index f529318..21327db 100644
--- a/manual/src/docs/tutorials/howto-releasing-apache.txt
+++ b/manual/src/docs/tutorials/howto-releasing-apache.txt
@@ -372,7 +372,7 @@
The distributions to be voted on are located here: https://dist.apache.org/repos/dist/dev/zest/
-Convenience artifacts in a maven repository are staged here: https://repository.apache.org/content/groups/staging/org/qi4j/
+Convenience artifacts in a maven repository are staged here: https://repository.apache.org/content/groups/staging/org/apache/zest/
Release distributions and convenience artifacts are signed with the following key: https://dist.apache.org/repos/dist/dev/zest/KEYS
diff --git a/manual/src/docs/tutorials/howto-use-io.txt b/manual/src/docs/tutorials/howto-use-io.txt
index 7eaecf6..318e299 100644
--- a/manual/src/docs/tutorials/howto-use-io.txt
+++ b/manual/src/docs/tutorials/howto-use-io.txt
@@ -89,7 +89,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Input.java
+source=core/io/src/main/java/org/apache/zest/io/Input.java
tag=input
-------------
@@ -105,7 +105,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Output.java
+source=core/io/src/main/java/org/apache/zest/io/Output.java
tag=output
-------------
@@ -118,7 +118,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Sender.java
+source=core/io/src/main/java/org/apache/zest/io/Sender.java
tag=sender
-------------
@@ -127,7 +127,7 @@
[snippet,java]
--------------
-source=core/io/src/main/java/org/qi4j/io/Receiver.java
+source=core/io/src/main/java/org/apache/zest/io/Receiver.java
tag=receiver
-------------
@@ -147,7 +147,7 @@
[snippet,java]
--------------
-source=manual/src/main/java/org/qi4j/manual/recipes/io/Docs.java
+source=manual/src/main/java/org/apache/zest/manual/recipes/io/Docs.java
tag=filter
--------------
diff --git a/manual/src/docs/tutorials/howto-writing-docs.txt b/manual/src/docs/tutorials/howto-writing-docs.txt
index d5eb13e..d578e57 100644
--- a/manual/src/docs/tutorials/howto-writing-docs.txt
+++ b/manual/src/docs/tutorials/howto-writing-docs.txt
@@ -226,7 +226,7 @@
----
[snippet,java]
-----------
- source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java
+ source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java
tag=mainClass
-----------
----
@@ -236,11 +236,11 @@
[source]
----
-package org.qi4j.demo.tenminute;
+package org.apache.zest.demo.tenminute;
-import org.qi4j.api.concern.Concerns;
-import org.qi4j.api.entity.EntityComposite;
-import org.qi4j.api.sideeffect.SideEffects;
+import org.apache.zest.api.concern.Concerns;
+import org.apache.zest.api.entity.EntityComposite;
+import org.apache.zest.api.sideeffect.SideEffects;
// START SNIPPET: sideEffect
@SideEffects( MailNotifySideEffect.class )
@@ -259,7 +259,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java
tag=mainClass
-----------
diff --git a/manual/src/docs/userguide/glossary.txt b/manual/src/docs/userguide/glossary.txt
index 38a1205..e523451 100644
--- a/manual/src/docs/userguide/glossary.txt
+++ b/manual/src/docs/userguide/glossary.txt
@@ -231,7 +231,7 @@
[[def-invocation-stack,Invocation Stack]]Invocation Stack::
+
--
-For each method, Qi4J will create and re-use an Invocation Stack. It will be built with the sequence of
+For each method, Zest™ will create and re-use an Invocation Stack. It will be built with the sequence of
<<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
diff --git a/manual/src/docs/website/intro.txt b/manual/src/docs/website/intro.txt
index 8b86d4a..1e17772 100644
--- a/manual/src/docs/website/intro.txt
+++ b/manual/src/docs/website/intro.txt
@@ -36,7 +36,7 @@
:leveloffset: 2
-// include::../../../../tutorials/introduction/src/docs/qi4j-cop.txt[]
+// include::../../../../tutorials/introduction/src/docs/zest-cop.txt[]
//
// :leveloffset: 2
diff --git a/tests/regression/README-for-regression-reporting.txt b/tests/regression/README-for-regression-reporting.txt
index 5a8cb40..b4dcb3e 100644
--- a/tests/regression/README-for-regression-reporting.txt
+++ b/tests/regression/README-for-regression-reporting.txt
@@ -3,14 +3,14 @@
1. Go to http://ops4j1.jira.com/browse/QI and create a new JIRA issue about the problem.
-2. Create a package named org.qi4j.tests.regression.qi123 (for QI-123) in $QI4J/tests/regression/src/main/java.
+2. Create a package named org.apache.zest.tests.regression.qi123 (for QI-123) in $ZEST/tests/regression/src/main/java.
NOTE: observe that the test MUST sit in the src/MAIN/java and not under src/test
3. Create a JUnit or TestNG test capturing the issue described in JIRA.
4. Commit and push this to the 'origin develop' branch.
-5. Ping the community on the qi4j-dev forum at Google Groups.
+5. Ping the community on the dev@zest.apache.org mailing list.
Once the reported problem has been solved, the test will be moved to the sub-project's unit test area.
diff --git a/tools/envisage/src/docs/envisage.txt b/tools/envisage/src/docs/envisage.txt
index 01551c0..fb3a8b3 100644
--- a/tools/envisage/src/docs/envisage.txt
+++ b/tools/envisage/src/docs/envisage.txt
@@ -29,7 +29,7 @@
[snippet,java]
----
-source=tools/envisage/src/test/java/org/qi4j/envisage/school/EnvisageSchoolSample.java
+source=tools/envisage/src/test/java/org/apache/zest/envisage/school/EnvisageSchoolSample.java
tag=envisage
----
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/Qi4jApplicationComponent.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java
similarity index 77%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/Qi4jApplicationComponent.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java
index 8d1c37e..9bebb6b 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/Qi4jApplicationComponent.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea;
+package org.apache.zest.ide.plugin.idea;
import com.intellij.codeInspection.InspectionToolProvider;
import com.intellij.facet.FacetTypeRegistry;
@@ -25,19 +25,19 @@
import com.intellij.openapi.fileTypes.FileTypeManager;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.appliesTo.inspections.AppliesToAnnotationDeclaredCorrectlyInspection;
-import org.qi4j.ide.plugin.idea.common.facet.Qi4jFacetType;
-import org.qi4j.ide.plugin.idea.concerns.inspections.ConcernsAnnotationDeclaredCorrectlyInspection;
-import org.qi4j.ide.plugin.idea.injections.invocation.inspections.InvocationAnnotationDeclaredCorrectlyInspection;
-import org.qi4j.ide.plugin.idea.injections.service.inspections.ServiceAnnotationDeclaredCorrectlyInspection;
-import org.qi4j.ide.plugin.idea.injections.structure.inspections.StructureAnnotationDeclaredCorrectlyInspection;
-import org.qi4j.ide.plugin.idea.mixins.inspections.MixinImplementsMixinType;
-import org.qi4j.ide.plugin.idea.mixins.inspections.MixinsAnnotationDeclaredOnMixinType;
-import org.qi4j.ide.plugin.idea.sideEffects.inspections.SideEffectsAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.appliesTo.inspections.AppliesToAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.common.facet.Qi4jFacetType;
+import org.apache.zest.ide.plugin.idea.concerns.inspections.ConcernsAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.injections.invocation.inspections.InvocationAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.injections.service.inspections.ServiceAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.injections.structure.inspections.StructureAnnotationDeclaredCorrectlyInspection;
+import org.apache.zest.ide.plugin.idea.mixins.inspections.MixinImplementsMixinType;
+import org.apache.zest.ide.plugin.idea.mixins.inspections.MixinsAnnotationDeclaredOnMixinType;
+import org.apache.zest.ide.plugin.idea.sideEffects.inspections.SideEffectsAnnotationDeclaredCorrectlyInspection;
import javax.swing.*;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java
similarity index 93%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java
index 32949c5..745e31b 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.appliesTo.common;
+package org.apache.zest.ide.plugin.idea.appliesTo.common;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java
similarity index 86%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java
index 3500c6f..242e4e6 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.appliesTo.common;
+package org.apache.zest.ide.plugin.idea.appliesTo.common;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -27,12 +27,12 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static java.util.Collections.emptyList;
-import static org.qi4j.ide.plugin.idea.appliesTo.common.Qi4jAppliesToConstants.QUALIFIED_NAME_APPLIES_TO;
-import static org.qi4j.ide.plugin.idea.appliesTo.common.Qi4jAppliesToConstants.QUALIFIED_NAME_APPLIES_TO_FILTER;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.appliesTo.common.Qi4jAppliesToConstants.QUALIFIED_NAME_APPLIES_TO;
+import static org.apache.zest.ide.plugin.idea.appliesTo.common.Qi4jAppliesToConstants.QUALIFIED_NAME_APPLIES_TO_FILTER;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java
index e778c68..08641e8 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/inspections/AppliesToAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.appliesTo.inspections;
+package org.apache.zest.ide.plugin.idea.appliesTo.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -22,21 +22,21 @@
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
import java.util.LinkedList;
import java.util.List;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.appliesTo.common.Qi4jAppliesToUtil.*;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.isImplementsInvocationHandler;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAGenericConcern;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isAGenericSideEffect;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
+import static org.apache.zest.ide.plugin.idea.appliesTo.common.Qi4jAppliesToUtil.*;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.isImplementsInvocationHandler;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAGenericConcern;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isAGenericSideEffect;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java
similarity index 98%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java
index 874fee9..fb10d31 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/AbstractCreateElementActionBase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.actions;
+package org.apache.zest.ide.plugin.idea.common.actions;
import com.intellij.CommonBundle;
import com.intellij.ide.actions.CreateElementActionBase;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java
similarity index 94%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java
index 3b141a3..1899b51 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/Qi4jCreateActionGroup.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.actions;
+package org.apache.zest.ide.plugin.idea.common.actions;
import com.intellij.ide.IdeView;
import com.intellij.openapi.actionSystem.*;
@@ -25,7 +25,7 @@
import com.intellij.psi.JavaDirectoryService;
import com.intellij.psi.PsiDirectory;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacet.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacet.java
similarity index 96%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacet.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacet.java
index d03dcb0..eb6d706 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacet.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.facet;
+package org.apache.zest.ide.plugin.idea.common.facet;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetManager;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java
index d3172c7..fd03600 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.facet;
+package org.apache.zest.ide.plugin.idea.common.facet;
import com.intellij.facet.FacetConfiguration;
import com.intellij.facet.ui.FacetEditorContext;
@@ -23,7 +23,7 @@
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import org.jdom.Element;
-import org.qi4j.ide.plugin.idea.common.facet.ui.Qi4jFacetEditorTab;
+import org.apache.zest.ide.plugin.idea.common.facet.ui.Qi4jFacetEditorTab;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetType.java
similarity index 98%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetType.java
index a90ecec..06af246 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/Qi4jFacetType.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/Qi4jFacetType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.facet;
+package org.apache.zest.ide.plugin.idea.common.facet;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetType;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java
similarity index 96%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java
index de96adf..7e73b49 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/facet/ui/Qi4jFacetEditorTab.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.facet.ui;
+package org.apache.zest.ide.plugin.idea.common.facet.ui;
import com.intellij.facet.ui.FacetEditorContext;
import com.intellij.facet.ui.FacetEditorTab;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractFix.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
similarity index 88%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractFix.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
index 879cca1..c6b9893 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractFix.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.inspections;
+package org.apache.zest.ide.plugin.idea.common.inspections;
import com.intellij.codeInspection.LocalQuickFix;
import org.jetbrains.annotations.NotNull;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
index c268ce1..55d59dd 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/inspections/AbstractInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.inspections;
+package org.apache.zest.ide.plugin.idea.common.inspections;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInspection.BaseJavaLocalInspectionTool;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle;
+import org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle;
import static com.intellij.codeHighlighting.HighlightDisplayLevel.ERROR;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/intentions/AbstractIntention.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/intentions/AbstractIntention.java
similarity index 96%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/intentions/AbstractIntention.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/intentions/AbstractIntention.java
index c66bc9f..7bd1b9d 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/intentions/AbstractIntention.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/intentions/AbstractIntention.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.intentions;
+package org.apache.zest.ide.plugin.idea.common.intentions;
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
import com.intellij.openapi.editor.CaretModel;
@@ -28,7 +28,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
/**
* This class is based from {@code com.siyeh.ipp.base.Intention}
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiAnnotationUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiAnnotationUtil.java
similarity index 98%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiAnnotationUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiAnnotationUtil.java
index c8006f2..f61086d 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiAnnotationUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiAnnotationUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.psi;
+package org.apache.zest.ide.plugin.idea.common.psi;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiClassUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiClassUtil.java
similarity index 95%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiClassUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiClassUtil.java
index 685954a..3c330c0 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/PsiClassUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/PsiClassUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.psi;
+package org.apache.zest.ide.plugin.idea.common.psi;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
@@ -25,7 +25,7 @@
import java.util.HashSet;
import java.util.Set;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java
similarity index 93%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java
index f0437e2..bef9dc4 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/psi/search/GlobalSearchScopeUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.psi.search;
+package org.apache.zest.ide.plugin.idea.common.psi.search;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
@@ -26,7 +26,7 @@
import org.jetbrains.annotations.Nullable;
import static com.intellij.openapi.module.ModuleUtil.findModuleForPsiElement;
-import static org.qi4j.ide.plugin.idea.common.vfs.VirtualFileUtil.getVirtualFile;
+import static org.apache.zest.ide.plugin.idea.common.vfs.VirtualFileUtil.getVirtualFile;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/resource/Qi4jResourceBundle.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/resource/Qi4jResourceBundle.java
similarity index 96%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/resource/Qi4jResourceBundle.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/resource/Qi4jResourceBundle.java
index 6827b23..72af195 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/resource/Qi4jResourceBundle.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/resource/Qi4jResourceBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.resource;
+package org.apache.zest.ide.plugin.idea.common.resource;
import com.intellij.CommonBundle;
import org.jetbrains.annotations.NonNls;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/vfs/VirtualFileUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/vfs/VirtualFileUtil.java
similarity index 97%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/vfs/VirtualFileUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/vfs/VirtualFileUtil.java
index 53b3bc4..29407c1 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/common/vfs/VirtualFileUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/vfs/VirtualFileUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.common.vfs;
+package org.apache.zest.ide.plugin.idea.common.vfs;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java
index b762e3b..df4aea1 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/CreateConcernFromMixinTypeOrCompositeAction.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.actions.create;
+package org.apache.zest.ide.plugin.idea.concerns.actions.create;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.actions.AbstractCreateElementActionBase;
+import org.apache.zest.ide.plugin.idea.common.actions.AbstractCreateElementActionBase;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java
similarity index 88%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java
index a82dc07..a171b20 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/actions/create/inPackage/CreateConcernOfInPackageAction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.actions.create.inPackage;
+package org.apache.zest.ide.plugin.idea.concerns.actions.create.inPackage;
import com.intellij.ide.actions.CreateInPackageActionBase;
import com.intellij.openapi.actionSystem.DataContext;
@@ -31,10 +31,10 @@
import static com.intellij.openapi.actionSystem.DataKeys.PROJECT;
import static com.intellij.openapi.actionSystem.DataKeys.PSI_ELEMENT;
import static com.intellij.util.Icons.CLASS_ICON;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernConstants.TEMPLATE_GENERIC_CONCERN_OF;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.getConcernOfClass;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernConstants.TEMPLATE_GENERIC_CONCERN_OF;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.getConcernOfClass;
/**
* JAVADOC: Non generic concern
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java
similarity index 95%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java
index 57199be..9e1dfdd 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.common;
+package org.apache.zest.ide.plugin.idea.concerns.common;
import org.jetbrains.annotations.NonNls;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java
similarity index 93%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java
index 0771228..45fb79d 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/common/Qi4jConcernUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.common;
+package org.apache.zest.ide.plugin.idea.concerns.common;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -27,11 +27,11 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static java.util.Collections.emptyList;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernConstants.*;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernConstants.*;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java
similarity index 91%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java
index 5e74d9f..fc598d5 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/inspections/ConcernsAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.inspections;
+package org.apache.zest.ide.plugin.idea.concerns.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -25,17 +25,17 @@
import com.intellij.psi.PsiJavaCodeReferenceElement;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
-import org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle;
import java.util.LinkedList;
import java.util.List;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.*;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.*;
/**
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java
similarity index 89%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java
index 91517e4..9a06c04 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/concerns/intentions/add/AddConcernOnType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.concerns.intentions.add;
+package org.apache.zest.ide.plugin.idea.concerns.intentions.add;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -27,16 +27,16 @@
import com.intellij.util.Query;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.qi4j.ide.plugin.idea.common.intentions.AbstractIntention;
+import org.apache.zest.ide.plugin.idea.common.intentions.AbstractIntention;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.psi.search.searches.ClassInheritorsSearch.search;
import static java.util.Collections.emptyList;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.addOrReplaceConcernAnnotation;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.getConcernOfClass;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.addOrReplaceConcernAnnotation;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.getConcernOfClass;
/**
* JAVADOC: This is disabled in Qi4jApplicationComponent.
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java
similarity index 95%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java
index 8d601ab..d84fb33 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.common.inspections;
+package org.apache.zest.ide.plugin.idea.injections.common.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -23,7 +23,7 @@
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiParameterList;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
import java.util.LinkedList;
import java.util.List;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java
index cf2ffe9..88b3e24 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/common/inspections/AbstractInjectionAnnotationDeclarationOnFieldInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.common.inspections;
+package org.apache.zest.ide.plugin.idea.injections.common.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -25,8 +25,8 @@
import com.intellij.psi.PsiVariable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
@@ -109,7 +109,7 @@
@NotNull protected String getInjectionAnnotationValidDeclarationMessage()
{
String annotationQualifiedName = getAnnotationToCheckQualifiedName();
- return org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message( "abstract.injection.annotation.declaration.inspection.error.annotation.not.declared.correctly",
+ return org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message( "abstract.injection.annotation.declaration.inspection.error.annotation.not.declared.correctly",
annotationQualifiedName );
}
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java
index d77d0c5..c2004c6 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.invocation.common;
+package org.apache.zest.ide.plugin.idea.injections.invocation.common;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java
similarity index 86%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java
index 3417d2c..c7ef6da 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/common/Qi4jInvocationAnnotationUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.invocation.common;
+package org.apache.zest.ide.plugin.idea.injections.invocation.common;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
@@ -22,10 +22,10 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static com.intellij.psi.PsiModifier.STATIC;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
-import static org.qi4j.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationConstants.QUALIFIED_NAME_INVOCATION_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.InvocationAnnotationDeclarationValidationResult.*;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.isInjecteableByStructureAnnotation;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
+import static org.apache.zest.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationConstants.QUALIFIED_NAME_INVOCATION_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.InvocationAnnotationDeclarationValidationResult.*;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.isInjecteableByStructureAnnotation;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java
similarity index 80%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java
index d445b95..57e9b60 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/invocation/inspections/InvocationAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.invocation.inspections;
+package org.apache.zest.ide.plugin.idea.injections.invocation.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
@@ -23,15 +23,15 @@
import com.intellij.psi.PsiVariable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.qi4j.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
-import org.qi4j.ide.plugin.idea.injections.structure.common.ReplaceWithStructureAnnotation;
+import org.apache.zest.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
+import org.apache.zest.ide.plugin.idea.injections.structure.common.ReplaceWithStructureAnnotation;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationConstants.QUALIFIED_NAME_INVOCATION_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.InvocationAnnotationDeclarationValidationResult;
-import static org.qi4j.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.isValidInvocationAnnotationDeclaration;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.getStructureAnnotation;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationConstants.QUALIFIED_NAME_INVOCATION_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.InvocationAnnotationDeclarationValidationResult;
+import static org.apache.zest.ide.plugin.idea.injections.invocation.common.Qi4jInvocationAnnotationUtil.isValidInvocationAnnotationDeclaration;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.getStructureAnnotation;
/**
* {@code InvocationAnnotationDeclaredCorrectlyInspection} validates {@code @Invocation} injection annotation
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java
similarity index 92%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java
index a47d974..4ab8602 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.service.common;
+package org.apache.zest.ide.plugin.idea.injections.service.common;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java
similarity index 85%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java
index dac9563..824466c 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/common/Qi4jServiceAnnotationUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.service.common;
+package org.apache.zest.ide.plugin.idea.injections.service.common;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiModifierList;
@@ -25,9 +25,9 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static com.intellij.psi.PsiModifier.STATIC;
-import static org.qi4j.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationConstants.QUALIFIED_NAME_SERVICE_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.ServiceAnnotationDeclarationValidationResult.*;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.isInjecteableByStructureAnnotation;
+import static org.apache.zest.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationConstants.QUALIFIED_NAME_SERVICE_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.ServiceAnnotationDeclarationValidationResult.*;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.isInjecteableByStructureAnnotation;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java
similarity index 79%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java
index 60e5bcd..be3a82b 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/service/inspections/ServiceAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.service.inspections;
+package org.apache.zest.ide.plugin.idea.injections.service.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
@@ -23,15 +23,15 @@
import com.intellij.psi.PsiVariable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.qi4j.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
-import org.qi4j.ide.plugin.idea.injections.structure.common.ReplaceWithStructureAnnotation;
+import org.apache.zest.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
+import org.apache.zest.ide.plugin.idea.injections.structure.common.ReplaceWithStructureAnnotation;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationConstants.QUALIFIED_NAME_SERVICE_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.ServiceAnnotationDeclarationValidationResult;
-import static org.qi4j.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.isValidServiceAnnotationDeclaration;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.getStructureAnnotation;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationConstants.QUALIFIED_NAME_SERVICE_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.ServiceAnnotationDeclarationValidationResult;
+import static org.apache.zest.ide.plugin.idea.injections.service.common.Qi4jServiceAnnotationUtil.isValidServiceAnnotationDeclaration;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.getStructureAnnotation;
/**
* {@code ServiceAnnotationDeclaredCorrectly} validates {@code @Service} injection annotation declaration.
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java
similarity index 95%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java
index bdaaa1b..9635ad4 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.structure.common;
+package org.apache.zest.ide.plugin.idea.injections.structure.common;
import static java.util.Arrays.sort;
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java
similarity index 88%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java
index b762e5e..da54dd9 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/Qi4jStructureAnnotationUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.structure.common;
+package org.apache.zest.ide.plugin.idea.injections.structure.common;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -23,9 +23,9 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static com.intellij.psi.PsiModifier.STATIC;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.QUALIFIED_NAME_STRUCTURE_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.VALID_STRUCTURE_INJECTION_TYPE;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.StructureAnnotationDeclarationValidationResult.*;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.QUALIFIED_NAME_STRUCTURE_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.VALID_STRUCTURE_INJECTION_TYPE;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.StructureAnnotationDeclarationValidationResult.*;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java
similarity index 84%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java
index 03e9b3e..3cd6fb6 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ReplaceWithStructureAnnotation.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.structure.common;
+package org.apache.zest.ide.plugin.idea.injections.structure.common;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiAnnotation;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.createStructureAnnotation;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.createStructureAnnotation;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java
similarity index 78%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java
index cf906d7..7baea38 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/inspections/StructureAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.injections.structure.inspections;
+package org.apache.zest.ide.plugin.idea.injections.structure.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -22,14 +22,14 @@
import com.intellij.psi.PsiVariable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.injections.common.inspections.AbstractInjectionAnnotationDeclarationOnFieldAndConstructorInspection;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.QUALIFIED_NAME_STRUCTURE_ANNOTATION;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.StructureAnnotationDeclarationValidationResult;
-import static org.qi4j.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.validateStructureAnnotationDeclaration;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationConstants.QUALIFIED_NAME_STRUCTURE_ANNOTATION;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.StructureAnnotationDeclarationValidationResult;
+import static org.apache.zest.ide.plugin.idea.injections.structure.common.Qi4jStructureAnnotationUtil.validateStructureAnnotationDeclaration;
/**
* {@code StructureAnnotationUsedCorrectly} validates {@code @Structure} injection annotation declaration.
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java
similarity index 93%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java
index aefef58..e2f02df 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.mixins.common;
+package org.apache.zest.ide.plugin.idea.mixins.common;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java
similarity index 89%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java
index be08dde..e8100bd 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/common/Qi4jMixinUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.mixins.common;
+package org.apache.zest.ide.plugin.idea.mixins.common;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -28,13 +28,13 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getExtendsDeep;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
-import static org.qi4j.ide.plugin.idea.mixins.common.Qi4jMixinConstants.QUALIFIED_NAME_MIXINS;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getExtendsDeep;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
+import static org.apache.zest.ide.plugin.idea.mixins.common.Qi4jMixinConstants.QUALIFIED_NAME_MIXINS;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java
similarity index 91%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java
index 2334cec..f03722f 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinImplementsMixinType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.mixins.inspections;
+package org.apache.zest.ide.plugin.idea.mixins.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -23,18 +23,18 @@
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiJavaCodeReferenceElement;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
-import static org.qi4j.ide.plugin.idea.mixins.common.Qi4jMixinUtil.*;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.concerns.common.Qi4jConcernUtil.isAConcern;
+import static org.apache.zest.ide.plugin.idea.mixins.common.Qi4jMixinUtil.*;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.isASideEffect;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java
similarity index 88%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java
index 6339ce8..c4ebfde 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/mixins/inspections/MixinsAnnotationDeclaredOnMixinType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.mixins.inspections;
+package org.apache.zest.ide.plugin.idea.mixins.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -23,12 +23,12 @@
import com.intellij.psi.PsiAnnotationMemberValue;
import com.intellij.psi.PsiClass;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.mixins.common.Qi4jMixinUtil.getMixinsAnnotation;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.mixins.common.Qi4jMixinUtil.getMixinsAnnotation;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java
similarity index 94%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java
index 5089f29..d417575 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.sideEffects.common;
+package org.apache.zest.ide.plugin.idea.sideEffects.common;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java
similarity index 91%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java
index 43912d1..1cd030b 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/common/Qi4jSideEffectUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.sideEffects.common;
+package org.apache.zest.ide.plugin.idea.sideEffects.common;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -27,11 +27,11 @@
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static java.util.Collections.emptyList;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
-import static org.qi4j.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectConstants.*;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getAnnotationDefaultParameterValue;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiAnnotationUtil.getClassReference;
+import static org.apache.zest.ide.plugin.idea.common.psi.PsiClassUtil.getPSIClass;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectConstants.*;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java
similarity index 90%
rename from tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java
rename to tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java
index ac4bb90..3bb6a19 100644
--- a/tools/qidea/src/main/java/org/qi4j/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/sideEffects/inspections/SideEffectsAnnotationDeclaredCorrectlyInspection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.qi4j.ide.plugin.idea.sideEffects.inspections;
+package org.apache.zest.ide.plugin.idea.sideEffects.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
@@ -25,18 +25,18 @@
import com.intellij.psi.PsiJavaCodeReferenceElement;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractFix;
-import org.qi4j.ide.plugin.idea.common.inspections.AbstractInspection;
-import org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle;
-import org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractFix;
+import org.apache.zest.ide.plugin.idea.common.inspections.AbstractInspection;
+import org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle;
+import org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil;
import java.util.LinkedList;
import java.util.List;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-import static org.qi4j.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
-import static org.qi4j.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
-import static org.qi4j.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.*;
+import static org.apache.zest.ide.plugin.idea.common.psi.search.GlobalSearchScopeUtil.determineSearchScope;
+import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message;
+import static org.apache.zest.ide.plugin.idea.sideEffects.common.Qi4jSideEffectUtil.*;
/**
* @author edward.yakop@gmail.com
diff --git a/tools/qidea/src/main/resources/META-INF/plugin.xml b/tools/qidea/src/main/resources/META-INF/plugin.xml
index 5a4a6e6..e85fd5d 100644
--- a/tools/qidea/src/main/resources/META-INF/plugin.xml
+++ b/tools/qidea/src/main/resources/META-INF/plugin.xml
@@ -27,20 +27,20 @@
<application-components>
<component>
- <implementation-class>org.qi4j.ide.plugin.idea.Qi4jApplicationComponent</implementation-class>
+ <implementation-class>org.apache.zest.ide.plugin.idea.Qi4jApplicationComponent</implementation-class>
</component>
</application-components>
<actions>
<action id="CreateConcernFromMixinTypeOrCompositeAction"
- class="org.qi4j.ide.plugin.idea.concerns.actions.create.CreateConcernFromMixinTypeOrCompositeAction"
+ class="org.apache.zest.ide.plugin.idea.concerns.actions.create.CreateConcernFromMixinTypeOrCompositeAction"
text="New Concern" description="Create new Zest™ concern">
<add-to-group group-id="CodeMenu" anchor="last"/>
</action>
- <group id="Zest" class="org.qi4j.ide.plugin.idea.common.actions.Qi4jCreateActionGroup" text="Zest™">
+ <group id="Zest" class="org.apache.zest.ide.plugin.idea.common.actions.Qi4jCreateActionGroup" text="Zest™">
<action id="Zest.NewConcernOf"
- class="org.qi4j.ide.plugin.idea.concerns.actions.create.inPackage.CreateConcernOfInPackageAction"
+ class="org.apache.zest.ide.plugin.idea.concerns.actions.create.inPackage.CreateConcernOfInPackageAction"
text="New Concern" description="Create new Zest concern">
</action>
<add-to-group group-id="NewGroup" anchor="last"/>
diff --git a/tools/qidea/src/main/resources/org/qi4j/ide/plugin/idea/common/resource/Qi4jResourceBundle.properties b/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/Qi4jResourceBundle.properties
similarity index 100%
rename from tools/qidea/src/main/resources/org/qi4j/ide/plugin/idea/common/resource/Qi4jResourceBundle.properties
rename to tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/Qi4jResourceBundle.properties
diff --git a/tutorials/composites/src/docs/step1.txt b/tutorials/composites/src/docs/step1.txt
index df8ce5c..fce9a72 100644
--- a/tutorials/composites/src/docs/step1.txt
+++ b/tutorials/composites/src/docs/step1.txt
@@ -27,7 +27,7 @@
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/HelloWorld.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial1/HelloWorld.java
tag=initial
----
@@ -57,28 +57,28 @@
*HelloWorld.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorld.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial2/HelloWorld.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial2/HelloWorldState.java
tag=solution
----
*HelloWorldBehaviour.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldBehaviour.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial2/HelloWorldBehaviour.java
tag=solution
----
*HelloWorldMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial2/HelloWorldMixin.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step2.txt b/tutorials/composites/src/docs/step2.txt
index 1268ce1..eb26138 100644
--- a/tutorials/composites/src/docs/step2.txt
+++ b/tutorials/composites/src/docs/step2.txt
@@ -34,7 +34,7 @@
Steps for this tutorial:
-- Create an interface that extends the domain interface HelloWorld and org.qi4j.api.composite.TransientComposite.
+- Create an interface that extends the domain interface +HelloWorld+ and +org.apache.zest.api.composite.TransientComposite+.
- Add a @Mixins annotation to it with the name of the Mixin as argument.
== Solution ==
@@ -48,14 +48,14 @@
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial3/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial3/HelloWorldComposite.java
tag=solution
----
*HelloWorldMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/HelloWorldMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial2/HelloWorldMixin.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step3.txt b/tutorials/composites/src/docs/step3.txt
index 3522898..e87014e 100644
--- a/tutorials/composites/src/docs/step3.txt
+++ b/tutorials/composites/src/docs/step3.txt
@@ -40,35 +40,35 @@
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial4/HelloWorldComposite.java
tag=solution
----
*HelloWorldBehaviour.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldBehaviour.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial4/HelloWorldBehaviour.java
tag=solution
----
*HelloWorldBehaviourMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldBehaviourMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial4/HelloWorldBehaviourMixin.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial4/HelloWorldState.java
tag=solution
----
*HelloWorldStateMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial4/HelloWorldStateMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial4/HelloWorldStateMixin.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step4.txt b/tutorials/composites/src/docs/step4.txt
index d940443..ed77e6a 100644
--- a/tutorials/composites/src/docs/step4.txt
+++ b/tutorials/composites/src/docs/step4.txt
@@ -63,14 +63,14 @@
*HelloWorldBehaviourMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/HelloWorldBehaviourMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial5/HelloWorldBehaviourMixin.java
tag=solution
----
*HelloWorldBehaviourConcern.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/HelloWorldBehaviourConcern.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial5/HelloWorldBehaviourConcern.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step5.txt b/tutorials/composites/src/docs/step5.txt
index 054d1ad..9e4dac5 100644
--- a/tutorials/composites/src/docs/step5.txt
+++ b/tutorials/composites/src/docs/step5.txt
@@ -66,28 +66,28 @@
*HelloWorldBehaviour.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial6/HelloWorldBehaviour.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial6/HelloWorldBehaviour.java
tag=solution
----
*HelloWorldBehaviourMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial6/HelloWorldBehaviourMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial6/HelloWorldBehaviourMixin.java
tag=solution
----
*HelloWorldBehaviourConcern.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial6/HelloWorldBehaviourConcern.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial6/HelloWorldBehaviourConcern.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial6/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial6/HelloWorldState.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step6.txt b/tutorials/composites/src/docs/step6.txt
index 4ba88e5..136f36a 100644
--- a/tutorials/composites/src/docs/step6.txt
+++ b/tutorials/composites/src/docs/step6.txt
@@ -62,28 +62,28 @@
*HelloWorldBehaviour.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/HelloWorldBehaviour.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial7/HelloWorldBehaviour.java
tag=solution
----
*HelloWorldBehaviourSideEffect.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/HelloWorldBehaviourSideEffect.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial7/HelloWorldBehaviourSideEffect.java
tag=solution
----
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial7/HelloWorldComposite.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial7/HelloWorldState.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step7.txt b/tutorials/composites/src/docs/step7.txt
index bdec58a..98fb3bd 100644
--- a/tutorials/composites/src/docs/step7.txt
+++ b/tutorials/composites/src/docs/step7.txt
@@ -80,28 +80,28 @@
*HelloWorldBehaviourMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial8/HelloWorldBehaviourMixin.java
tag=solution
----
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial8/HelloWorldComposite.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial8/HelloWorldState.java
tag=solution
----
*HelloWorldStateMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/HelloWorldStateMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial8/HelloWorldStateMixin.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step8.txt b/tutorials/composites/src/docs/step8.txt
index 90225ce..11e0752 100644
--- a/tutorials/composites/src/docs/step8.txt
+++ b/tutorials/composites/src/docs/step8.txt
@@ -60,21 +60,21 @@
*GenericPropertyMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/GenericPropertyMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial9/GenericPropertyMixin.java
tag=solution
----
*HelloWorldBehaviourMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/HelloWorldBehaviourMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial9/HelloWorldBehaviourMixin.java
tag=solution
----
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial9/HelloWorldComposite.java
tag=solution
----
diff --git a/tutorials/composites/src/docs/step9.txt b/tutorials/composites/src/docs/step9.txt
index 6e6047f..0108bab 100644
--- a/tutorials/composites/src/docs/step9.txt
+++ b/tutorials/composites/src/docs/step9.txt
@@ -65,20 +65,20 @@
*HelloWorldComposite.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial10/HelloWorldComposite.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial10/HelloWorldComposite.java
tag=solution
----
*HelloWorldMixin.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial10/HelloWorldMixin.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial10/HelloWorldMixin.java
tag=solution
----
*HelloWorldState.java*
[snippet,java]
----
-source=tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial10/HelloWorldState.java
+source=tutorials/composites/src/main/java/org/apache/zest/tutorials/composites/tutorial10/HelloWorldState.java
tag=solution
----
diff --git a/tutorials/introduction/src/docs/state-modeling.txt b/tutorials/introduction/src/docs/state-modeling.txt
index 0c5ec82..5a4aea1 100644
--- a/tutorials/introduction/src/docs/state-modeling.txt
+++ b/tutorials/introduction/src/docs/state-modeling.txt
@@ -48,7 +48,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/StateModelingDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/StateModelingDocs.java
tag=intro1
-----------
@@ -72,7 +72,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/StateModelingDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/StateModelingDocs.java
tag=roles
-----------
@@ -108,7 +108,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/StateModelingDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/StateModelingDocs.java
tag=values
-----------
@@ -142,7 +142,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/StateModelingDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/StateModelingDocs.java
tag=private
-----------
@@ -171,7 +171,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/StateModelingDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/StateModelingDocs.java
tag=more
-----------
diff --git a/tutorials/introduction/src/docs/whats-an-object.txt b/tutorials/introduction/src/docs/whats-an-object.txt
index 11bb20d..2a8cd05 100644
--- a/tutorials/introduction/src/docs/whats-an-object.txt
+++ b/tutorials/introduction/src/docs/whats-an-object.txt
@@ -90,7 +90,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/WhatsAnObjectDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/WhatsAnObjectDocs.java
tag=wo1
-----------
@@ -102,7 +102,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/WhatsAnObjectDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/WhatsAnObjectDocs.java
tag=wo2
-----------
@@ -114,7 +114,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/WhatsAnObjectDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/WhatsAnObjectDocs.java
tag=wo3
-----------
@@ -122,7 +122,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/src/main/java/org/qi4j/demo/intro/WhatsAnObjectDocs.java
+source=tutorials/introduction/src/main/java/org/apache/zest/demo/intro/WhatsAnObjectDocs.java
tag=wo4
-----------
@@ -199,5 +199,5 @@
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! :-)
+Comments and thoughts to dev@zest.apache.org mailing list on this are highly appreciated. This is very very important
+topics, and crucial to understanding/explaining why COP/Zest™ is so great! :-)
diff --git a/tutorials/introduction/src/docs/qi4j-cop.txt b/tutorials/introduction/src/docs/zest-cop.txt
similarity index 95%
rename from tutorials/introduction/src/docs/qi4j-cop.txt
rename to tutorials/introduction/src/docs/zest-cop.txt
index 0726ab8..fb06080 100644
--- a/tutorials/introduction/src/docs/qi4j-cop.txt
+++ b/tutorials/introduction/src/docs/zest-cop.txt
@@ -17,6 +17,6 @@
* under the License.
///////////////////////////////////////////////////////////////
-[[qi4j-cop,COP with Java and Zest™]]
+[[zest-cop,COP with Java and Zest™]]
= COP with Java and Zest™ =
diff --git a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
index dc86b5f..0d8c4ac 100644
--- a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
+++ b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
@@ -46,7 +46,7 @@
Composition is done with Java interfaces and Annotations. Example;
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java
tag=mainClass
-----------
@@ -56,7 +56,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/InventoryConcern.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/InventoryConcern.java
tag=allClass
-----------
@@ -80,7 +80,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java
tag=sideEffect
-----------
@@ -88,7 +88,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/MailNotifySideEffect.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/MailNotifySideEffect.java
tag=allClass
-----------
The MailService is dependency injected, as we have seen before.
diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
index 3913a9f..ff2fa34 100644
--- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
+++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
@@ -41,7 +41,7 @@
We will go back to the OrderEntity example;
[snippet,java]
-----------
-source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java
+source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java
tag=mainClass
-----------
@@ -52,7 +52,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=2
-----------
@@ -66,7 +66,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=3
-----------
@@ -81,7 +81,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=4
-----------
@@ -93,7 +93,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=5
-----------
@@ -115,7 +115,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=6
-----------
@@ -132,7 +132,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=7
-----------
@@ -144,7 +144,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtyminutes/ThirtyMinutesDocs.java
+source=tutorials/introduction/thirtyminutes/src/main/java/org/apache/zest/demo/thirtyminutes/ThirtyMinutesDocs.java
tag=8
-----------
diff --git a/tutorials/introduction/twominutes/src/docs/two-minutes.txt b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
index be502d2..d1ad443 100644
--- a/tutorials/introduction/twominutes/src/docs/two-minutes.txt
+++ b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
@@ -43,7 +43,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/twominutes/src/main/java/org/qi4j/demo/twominute/Speaker.java
+source=tutorials/introduction/twominutes/src/main/java/org/apache/zest/demo/twominute/Speaker.java
tag=documentation
-----------
@@ -52,7 +52,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/twominutes/src/main/java/org/qi4j/demo/twominute/SpeakerMixin.java
+source=tutorials/introduction/twominutes/src/main/java/org/apache/zest/demo/twominute/SpeakerMixin.java
tag=documentation
-----------
@@ -60,7 +60,7 @@
[snippet,java]
-----------
-source=tutorials/introduction/twominutes/src/main/java/org/qi4j/demo/twominute/Main.java
+source=tutorials/introduction/twominutes/src/main/java/org/apache/zest/demo/twominute/Main.java
tag=documentation
-----------
diff --git a/tutorials/services/src/docs/step3.txt b/tutorials/services/src/docs/step3.txt
index f81f3e1..e4d0f6f 100644
--- a/tutorials/services/src/docs/step3.txt
+++ b/tutorials/services/src/docs/step3.txt
@@ -41,7 +41,7 @@
- Delete the LibraryActivator and remove the @Activators annotation from the LibraryService and the corresponding createInitialData method.
- In the LibraryMixin remove the member injection of the ValueBuilderFactory, and instead inject the ValueBuilderFactory in the constructor.
- Inject the LibraryConfiguration via the constructor. The injection scope is @This.
-- Create a resource called LibraryService.properties and place it in the directory org/qi4j/tutorials/services/step4 in the classpath (for instance, src/main/resources ). Put something like this in:
+- Create a resource called LibraryService.properties and place it in the directory +org/apache/zest/tutorials/services/step4+ in the classpath (for instance, src/main/resources ). Put something like this in:
titles=Domain Driven Design, Pragmatic Programmer, Extreme Programming Explained
authors=Eric Evans, Andy Hunt, Kent Beck
#Number of copies of each book.
