Repository: zest-qi4j Updated Branches: refs/heads/develop 7ff180d5e -> 55f632eb4
More changes of "Qi4j" to "Zest" Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/247c146d Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/247c146d Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/247c146d Branch: refs/heads/develop Commit: 247c146d16f7e772db5a843fdda7558013df23e8 Parents: 72c2eae Author: Niclas Hedhman <[email protected]> Authored: Sun Jul 12 09:26:45 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Sun Jul 12 09:26:45 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/qi4j/api/activation/package.html | 2 +- core/api/src/main/java/org/qi4j/api/common/package.html | 10 +++++----- core/api/src/main/java/org/qi4j/api/package.html | 2 +- core/runtime/src/main/java/org/qi4j/runtime/package.html | 2 +- core/spi/src/main/java/org/qi4j/spi/package.html | 2 +- core/testsupport/src/main/java/org/qi4j/test/package.html | 2 +- .../src/main/java/org/qi4j/library/alarm/package.html | 8 ++++---- .../src/main/java/org/qi4j/library/servlet/package.html | 4 ++-- .../java/org/qi4j/library/spring/bootstrap/package.html | 2 +- .../java/org/qi4j/library/spring/importer/package.html | 2 +- manual/src/docs/reference/docinfo.xml | 4 ++-- manual/src/docs/reference/index.txt | 2 +- manual/src/docs/tutorials/docinfo.xml | 4 ++-- tools/qidea/src/main/resources/META-INF/plugin.xml | 10 +++++----- .../src/main/java/org/qi4j/tutorials/cargo/package.html | 4 ++-- .../main/java/org/qi4j/tutorials/cargo/step1/package.html | 6 +++--- .../main/java/org/qi4j/tutorials/cargo/step2/package.html | 4 ++-- .../main/java/org/qi4j/tutorials/composites/package.html | 6 +++--- .../org/qi4j/tutorials/composites/tutorial1/package.html | 2 +- .../org/qi4j/tutorials/composites/tutorial2/package.html | 4 ++-- .../org/qi4j/tutorials/composites/tutorial5/package.html | 10 +++++----- .../org/qi4j/tutorials/composites/tutorial7/package.html | 8 ++++---- .../org/qi4j/tutorials/composites/tutorial8/package.html | 4 ++-- .../org/qi4j/tutorials/composites/tutorial9/package.html | 4 ++-- tutorials/composites/src/main/javadoc/overview.html | 10 +++++----- .../java/org/qi4j/tutorials/services/step1/package.html | 4 ++-- .../java/org/qi4j/tutorials/services/step2/package.html | 2 +- .../java/org/qi4j/tutorials/services/step3/package.html | 6 +++--- 28 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/api/src/main/java/org/qi4j/api/activation/package.html ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/qi4j/api/activation/package.html b/core/api/src/main/java/org/qi4j/api/activation/package.html index ff809b6..47b333a 100644 --- a/core/api/src/main/java/org/qi4j/api/activation/package.html +++ b/core/api/src/main/java/org/qi4j/api/activation/package.html @@ -18,7 +18,7 @@ limitations under the License. <body> <h2>Activation API.</h2> <p> - The Activation API package contains types used by client code to integrate with the Qi4j Runtime activation + The Activation API package contains types used by client code to integrate with the Zest⢠Runtime activation mechanism. In assembly, client code can easily listen to Structure (Application, Layers and Modules) and Services activation events, or, declare Structure and Service Activators. </p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/api/src/main/java/org/qi4j/api/common/package.html ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/qi4j/api/common/package.html b/core/api/src/main/java/org/qi4j/api/common/package.html index 19e1662..f29de5d 100644 --- a/core/api/src/main/java/org/qi4j/api/common/package.html +++ b/core/api/src/main/java/org/qi4j/api/common/package.html @@ -18,7 +18,7 @@ limitations under the License. <body> <h2>Common API.</h2> <p> - The Common API package is a collection of really low-level types needed at the core of the Qi4j Runtime. It is also + The Common API package is a collection of really low-level types needed at the core of the Zest⢠Runtime. It is also a collection of types that are not particularly cohesive, and effectively this package contains the loose ends that does not belong elsewhere. </p> @@ -30,7 +30,7 @@ limitations under the License. <li>QualifiedName</li> <li>TypeName</li> </ul> - <p>UNLESS you are into deep integration into the Qi4j Runtime.</p> + <p>UNLESS you are into deep integration into the Zest⢠Runtime.</p> <h3>@AppliesTo and AppliesToFilter</h3> <p> @@ -40,7 +40,7 @@ limitations under the License. <h3>@Optional</h3> <p> - In Qi4j, method arguments, property values and injected fields are not allowed to be null by default. To allow + In Zestâ¢, method arguments, property values and injected fields are not allowed to be null by default. To allow any of these to be null, i.e. undeclared, it is required that the argument, field or method is marked with the @Optional annotation. </p> @@ -48,14 +48,14 @@ limitations under the License. <h3>@UseDefaults</h3> <p> Since null is not allowed without the @Optional annotation, it can sometimes by tedious to initialize all - the property values. And the @UseDefaults annotation allows us to declare that Qi4j should set the Property + the property values. And the @UseDefaults annotation allows us to declare that Zest⢠should set the Property to a default value. These are either the pre-defined ones, or can be set per property declaration during the assembly. </p> <h3>@Visibility</h3> <p> - Visibility is another innovative concept in Qi4j, which leverage the structure system (Application, Layer, Module) + Visibility is another innovative concept in Zestâ¢, which leverage the structure system (Application, Layer, Module) to limit the 'reach' when requesting composites and objects. The Visibility is declared per Composite/Object, preferably in the most restrictive mode possible, and the visibility resolver will ensure a predictable resolution algorithm; http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/api/src/main/java/org/qi4j/api/package.html ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/qi4j/api/package.html b/core/api/src/main/java/org/qi4j/api/package.html index bb0f4cd..ff7d9af 100644 --- a/core/api/src/main/java/org/qi4j/api/package.html +++ b/core/api/src/main/java/org/qi4j/api/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Qi4j API.</h2> + <h2>Apache Zest⢠API.</h2> </body> </html> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/runtime/src/main/java/org/qi4j/runtime/package.html ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/qi4j/runtime/package.html b/core/runtime/src/main/java/org/qi4j/runtime/package.html index a96783c..612d1ae 100644 --- a/core/runtime/src/main/java/org/qi4j/runtime/package.html +++ b/core/runtime/src/main/java/org/qi4j/runtime/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Qi4j Runtime.</h2> + <h2>Apache Zest⢠Runtime.</h2> </body> </html> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/spi/src/main/java/org/qi4j/spi/package.html ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/qi4j/spi/package.html b/core/spi/src/main/java/org/qi4j/spi/package.html index 5623fc3..faaf1b7 100644 --- a/core/spi/src/main/java/org/qi4j/spi/package.html +++ b/core/spi/src/main/java/org/qi4j/spi/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Qi4j SPI.</h2> + <h2>Apache Zest⢠SPI.</h2> </body> </html> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/core/testsupport/src/main/java/org/qi4j/test/package.html ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/qi4j/test/package.html b/core/testsupport/src/main/java/org/qi4j/test/package.html index 48ff2c4..8e463ac 100644 --- a/core/testsupport/src/main/java/org/qi4j/test/package.html +++ b/core/testsupport/src/main/java/org/qi4j/test/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Qi4j Test Support.</h2> + <h2>Apache Zest⢠Test Support.</h2> </body> </html> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/libraries/alarm/src/main/java/org/qi4j/library/alarm/package.html ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/main/java/org/qi4j/library/alarm/package.html b/libraries/alarm/src/main/java/org/qi4j/library/alarm/package.html index d6bd0b5..dbd518b 100644 --- a/libraries/alarm/src/main/java/org/qi4j/library/alarm/package.html +++ b/libraries/alarm/src/main/java/org/qi4j/library/alarm/package.html @@ -23,7 +23,7 @@ </p> <p> - This Alarm System, that is based on Qi4j's excellent persistence support, is an attempt at bringing a first-class + This Alarm System, that is based on Zest's excellent persistence support, is an attempt at bringing a first-class model from the industrial automation world into the enterprise of large-scale software systems, that nowadays are so large and un-wieldly that log files, syslog and emails can no longer cope with the burden of management needs. @@ -71,8 +71,8 @@ the behavior of the state machine in the <i>Alarm</i> itself. </p> <p> - The <i>Alarm Model</i> is an Qi4j <code>Service</code> and located via the normal <code>Visibility</code> rules, - making it possible to have a different <i>Alarm Model</i> in each Qi4j module. + The <i>Alarm Model</i> is an Zest⢠<code>Service</code> and located via the normal <code>Visibility</code> rules, + making it possible to have a different <i>Alarm Model</i> in each Zest⢠module. </p> <h2>Alarm Status</h2> @@ -98,7 +98,7 @@ </p> <h1>State Management</h1> <p> - <i>Alarm</i> instances are Qi4j Entities, so the <i>Alarm Status</i> is preserved over time in persisted storage. + <i>Alarm</i> instances are Zest⢠Entities, so the <i>Alarm Status</i> is preserved over time in persisted storage. This in turn means that the <i>Alarm</i> must be accessed within a <code>UnitOfWork</code> and the Alarm is not valid outside the <code>UnitOfWork</code>. </p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/libraries/servlet/src/main/java/org/qi4j/library/servlet/package.html ---------------------------------------------------------------------- diff --git a/libraries/servlet/src/main/java/org/qi4j/library/servlet/package.html b/libraries/servlet/src/main/java/org/qi4j/library/servlet/package.html index dfc553b..edc745e 100644 --- a/libraries/servlet/src/main/java/org/qi4j/library/servlet/package.html +++ b/libraries/servlet/src/main/java/org/qi4j/library/servlet/package.html @@ -18,7 +18,7 @@ limitations under the License. <body> <h2>Servlet Library.</h2> <p> - This library provide the necessary mechanism to bootstrap a Qi4j Application in a Servlet container plus + This library provide the necessary mechanism to bootstrap a Zest⢠Application in a Servlet container plus some facilities. </p> @@ -29,7 +29,7 @@ limitations under the License. <h3>Application Bootstrap</h3> <p> - Extends {@link org.qi4j.library.servlet.lifecycle.AbstractQi4jServletBootstrap} to easily bind a Qi4j + Extends {@link org.qi4j.library.servlet.lifecycle.AbstractQi4jServletBootstrap} to easily bind a Zest⢠{@link org.qi4j.api.structure.Application} activation/passivation to your webapp lifecycle. </p> <p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/package.html ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/package.html b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/package.html index 98f04e6..664565f 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/package.html +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/bootstrap/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Run a Qi4j Application as a Spring Bean and export its Services to Spring.</h2> + <h2>Run a Zest⢠Application as a Spring Bean and export its Services to Spring.</h2> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/libraries/spring/src/main/java/org/qi4j/library/spring/importer/package.html ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/qi4j/library/spring/importer/package.html b/libraries/spring/src/main/java/org/qi4j/library/spring/importer/package.html index e77b9ba..5a9a6cc 100644 --- a/libraries/spring/src/main/java/org/qi4j/library/spring/importer/package.html +++ b/libraries/spring/src/main/java/org/qi4j/library/spring/importer/package.html @@ -16,6 +16,6 @@ limitations under the License. --> <html> <body> - <h2>Import Spring Services inside a Qi4j Application.</h2> + <h2>Import Spring Services inside a Zest⢠Application.</h2> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/manual/src/docs/reference/docinfo.xml ---------------------------------------------------------------------- diff --git a/manual/src/docs/reference/docinfo.xml b/manual/src/docs/reference/docinfo.xml index c970145..28df1f5 100644 --- a/manual/src/docs/reference/docinfo.xml +++ b/manual/src/docs/reference/docinfo.xml @@ -15,13 +15,13 @@ limitations under the License. --> <authorgroup> - <corpauthor>The Qi4j Community + <corpauthor>The Zest⢠Community </corpauthor> </authorgroup> <copyright> <year>2011</year> -<holder>Qi4j Community</holder> +<holder>Zest⢠Community</holder> </copyright> <legalnotice> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/manual/src/docs/reference/index.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/reference/index.txt b/manual/src/docs/reference/index.txt index 8afc748..0b2d397 100644 --- a/manual/src/docs/reference/index.txt +++ b/manual/src/docs/reference/index.txt @@ -18,7 +18,7 @@ /////////////////////////////////////////////////////////////// [[reference-documentation,Reference Manual]] -= Qi4jv{revnumber} Reference Manual = += Apache Zest⢠v{revnumber} Reference Manual = :qi4j-version: {revnumber} :qi4j-buildnumber: {revnumber} http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/manual/src/docs/tutorials/docinfo.xml ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/docinfo.xml b/manual/src/docs/tutorials/docinfo.xml index eeee073..7c3ae97 100644 --- a/manual/src/docs/tutorials/docinfo.xml +++ b/manual/src/docs/tutorials/docinfo.xml @@ -15,13 +15,13 @@ limitations under the License. --> <authorgroup> - <corpauthor>The Qi4j Community + <corpauthor>The Zest⢠Community </corpauthor> </authorgroup> <copyright> <year>2011</year> - <holder>Qi4j Community</holder> + <holder>Zest⢠Community</holder> </copyright> <legalnotice> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tools/qidea/src/main/resources/META-INF/plugin.xml ---------------------------------------------------------------------- diff --git a/tools/qidea/src/main/resources/META-INF/plugin.xml b/tools/qidea/src/main/resources/META-INF/plugin.xml index 4a678d1..5a4a6e6 100644 --- a/tools/qidea/src/main/resources/META-INF/plugin.xml +++ b/tools/qidea/src/main/resources/META-INF/plugin.xml @@ -18,7 +18,7 @@ <idea-plugin> <id>org.qi4j</id> <name>qidea</name> - <description>Qi4j idea plugin</description> + <description>Apache Zest⢠idea plugin</description> <version>0.1</version> <vendor>codedragons</vendor> <idea-version since-build="8000"/> @@ -34,14 +34,14 @@ <actions> <action id="CreateConcernFromMixinTypeOrCompositeAction" class="org.qi4j.ide.plugin.idea.concerns.actions.create.CreateConcernFromMixinTypeOrCompositeAction" - text="New Concern" description="Create new Qi4j concern"> + text="New Concern" description="Create new Zest⢠concern"> <add-to-group group-id="CodeMenu" anchor="last"/> </action> - <group id="Qi4j" class="org.qi4j.ide.plugin.idea.common.actions.Qi4jCreateActionGroup" text="Qi4j"> - <action id="Qi4j.NewConcernOf" + <group id="Zest" class="org.qi4j.ide.plugin.idea.common.actions.Qi4jCreateActionGroup" text="Zestâ¢"> + <action id="Zest.NewConcernOf" class="org.qi4j.ide.plugin.idea.concerns.actions.create.inPackage.CreateConcernOfInPackageAction" - text="New Concern" description="Create new Qi4j concern"> + text="New Concern" description="Create new Zest concern"> </action> <add-to-group group-id="NewGroup" anchor="last"/> </group> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/package.html ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/package.html b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/package.html index f50373c..7dd1df5 100644 --- a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/package.html +++ b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/package.html @@ -21,13 +21,13 @@ limitations under the License. In Eric Evans' book Domain Driven Design, ISBN 0-321-12521-5, we find a domain oriented discussion around cargo making voyages from the starting point to a destination. The discussion in DDD is not continuous, so we need to find the many snippets throughout the book. We will try to - address each piece found in the book as it appears, and how that is dealt with in Qi4j. + address each piece found in the book as it appears, and how that is dealt with in Apache Zestâ¢. </p> <p> We have chosen the Cargo example also due to the fact that Mr Evans uses this in presentations about Domain Driven Design, and that it represents exactly the type of applications that we think - Qi4j is made for. + Zest⢠is made for. </p> <p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step1/package.html ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step1/package.html b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step1/package.html index ce0de38..c196e3f 100644 --- a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step1/package.html +++ b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step1/package.html @@ -82,7 +82,7 @@ limitations under the License. <p> Now, what we have done so far is to just use plain Java to implement the discussion of Mr Evans' Cargo example of domain-driven design. Before we move on to making the model more complex, and changing - the model as we understand it better, let's first refactor this into Qi4j and discuss the immediate + the model as we understand it better, let's first refactor this into Zest⢠and discuss the immediate differences. </p> @@ -90,9 +90,9 @@ limitations under the License. Steps; </p> <ol> - <li>Cargo has a <i>size</i> property. We change that to use the <i>Property</i> feature in Qi4j.</li> + <li>Cargo has a <i>size</i> property. We change that to use the <i>Property</i> feature in Zestâ¢.</li> <li>Voyage likewise has the <i>capacity</i> and <i>bookedCargoSize</i> properties.</li> - <li>Qi4j doesn't need implementations of the Cargo and Voyage implementations.</li> + <li>Zest⢠doesn't need implementations of the Cargo and Voyage implementations.</li> <li>Cargo and Voyage are entities, so we create CargoEntity and VoyageEntity interfaces.</li> </ol> </body> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step2/package.html ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step2/package.html b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step2/package.html index 35000c0..cab1d68 100644 --- a/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step2/package.html +++ b/tutorials/cargo/src/main/java/org/qi4j/tutorials/cargo/step2/package.html @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> <body> -<h1>Step 2 - Qi4j "Making a booking."</h1> +<h1>Step 2 - Zest⢠"Making a booking."</h1> <p> Location: Page 17, "Knowledge-Rich Design. @@ -24,7 +24,7 @@ limitations under the License. <h2>Results from Step1</h2> <ul> <li>For the Cargo and Voyage interfaces, we have introduced the <i>Property<Double></i>. - <i>Property</i> is an explicitly supported type in Qi4j, which makes life a lot easier + <i>Property</i> is an explicitly supported type in Zestâ¢, which makes life a lot easier for everyone involved. </li> <li>The SequenceGenerator has changed the name to "HasSequence", since it doesn't handle the http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/package.html index 145f459..eb0be63 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/package.html @@ -23,10 +23,10 @@ Description of TransientComposite tutorials. <h2>TransientComposite tutorials</h2> <p> Throughout this set of tutorials it will be shown how to create and work with TransientComposites, which -is the basic element in Qi4j. We will refactor one HelloWorld class to take advantage of the various -features in Qi4j. These refactorings will make it easier to reuse parts of the class, +is the basic element in Apache Zestâ¢. We will refactor one HelloWorld class to take advantage of the various +features in Zestâ¢. These refactorings will make it easier to reuse parts of the class, and introduce new features without having to change existing code. We will also look -at some of the existing classes, or Fragments, available in Qi4j that you can reuse +at some of the existing classes, or Fragments, available in Zest⢠that you can reuse so that you don't have to write everything yourself. </p> <p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/package.html index 3885b83..f3465b8 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial1/package.html @@ -22,7 +22,7 @@ the two properties "phrase" and "name". If invoked with the properties set to "H and "World" respectively it will hence return "Hello World". </p> <p> -Qi4j relies heavily on the use of interfaces. This makes it possible for an object +Zest⢠relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of interfaces which internally is backed by a number of Mixins, some of which you may have written yourself, and some of which may have been reused. This also makes it easy to introduce Modifiers (aka "interceptors", aka "advice"), http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/package.html index 4b2460b..cded1fe 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial2/package.html @@ -26,8 +26,8 @@ the framework will inspect the interface to determine what the TransientComposit look like in terms of used Fragments. </p> <p> -In Qi4j all method parameters are considered mandatory unless marked as @Optional. Therefore you can -remove the null checks in the Mixin. If a null value is passed in an exception will be thrown by Qi4j. +In Zest⢠all method parameters are considered mandatory unless marked as @Optional. Therefore you can +remove the null checks in the Mixin. If a null value is passed in an exception will be thrown by Zestâ¢. </p> <p> Steps for this tutorial: http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/package.html index b504cd8..c5b40c8 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial5/package.html @@ -24,13 +24,13 @@ string regular expressions, and so on, cannot be expressed, and so we have to pu then manually add these checks in the implementation class. </p> <p> -In Qi4j there is the option to use Constraints, which are further restrictions on the parameters. +In Zest⢠there is the option to use Constraints, which are further restrictions on the parameters. This is implemented by having an annotation that describes what the Constraint does, and then an implementation class that checks whether a specific value fulfills the Constraint or not. </p> <p> -There are a number of pre-written constraints in Qi4j which you can use. The null check of the original -HelloWorld version is already handled by default since Qi4j considers method parameters to be mandatory if not +There are a number of pre-written constraints in Zest⢠which you can use. The null check of the original +HelloWorld version is already handled by default since Zest⢠considers method parameters to be mandatory if not explicitly marked with the @Optional annotation. So, instead of doing that check we will add other checks that are useful to make, such as ensuring that the passed in string is not empty. </p> @@ -52,8 +52,8 @@ Steps for this tutorial: </ol> <p><em>Note:</em></p> <p> - The previous steps had a dependency to the <code>qi4j-core-api</code> only. The constraints - you've used in this step, introduce a new dependency to the <code>qi4j-lib-constraints</code> + The previous steps had a dependency to the <code>org.qi4j.core.api</code> only. The constraints + you've used in this step, introduce a new dependency to the <code>org.qi4j.library.constraints</code> library, where all the constraint related classes reside. So update your classpath settings accordingly. </p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/package.html index 4b2fd0d..41156c1 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial7/package.html @@ -17,12 +17,12 @@ limitations under the License. <body> <h1>Tutorial 7 - Properties</h1> <p> -One of the goals of Qi4j is to give you domain modeling tools that allow you to more concisely use +One of the goals of Apache Zest⢠is to give you domain modeling tools that allow you to more concisely use domain concepts in code. One of the things we do rather often is model Properties of objects as getters and setters. But this is a very weak model, and does not give you any access to metadata about the property, and also makes common tasks like UI binding non-trivial. There is also a lot of repetition of code, which is unnecessary. Using JavaBeans conventions one typically have to have code in five places for one property, -whereas in Qi4j the same thing can be achieved with one line of code. +whereas in Zest⢠the same thing can be achieved with one line of code. </p> <p> But lets start out easy. To declare a property you have to make a method in a mixin type that returns a value @@ -41,13 +41,13 @@ thus reducing Properties to one-liners! </p> <p> In the Mixin implementation of the interface with the Property declaration you should have an injection -of the Property, which is created for you by Qi4j. The injection can be done in a field like this: +of the Property, which is created for you by Zestâ¢. The injection can be done in a field like this: </p> <pre> @State Property<String> name; </pre> <p> -The State dependency injection annotation means that Qi4j will inject the Property for you. The field +The State dependency injection annotation means that Zest⢠will inject the Property for you. The field has the name "name", which matches the name in the interface, and therefore that Property is injected. You can then implement the method trivially by just returning the "name" field. </p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/package.html index 01e7d9e..c9a5781 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial8/package.html @@ -32,7 +32,7 @@ object that was invoked (the TransientComposite in this case), the method, and t Fragment is then allowed to implement the method any way it wants. </p> <p> -Since interfaces with only Properties is such a common case Qi4j already has a generic Mixin +Since interfaces with only Properties is such a common case Zest⢠already has a generic Mixin that implements the Properties management described above, but for the builtin Property type instead of the getter/setter variant. The class is aptly named PropertyMixin. </p> @@ -46,7 +46,7 @@ Steps for this tutorial: <li>Remove the HelloWorldStateMixin</li> <li>Add a GenericPropertyMixin, and have it implement InvocationHandler</li> <li>Inject "@State StateHolder state" in the mixin. The StateHolder interface will give - you access to the Properties for the TransientComposite which Qi4j manages for you + you access to the Properties for the TransientComposite which Zest⢠manages for you </li> <li>On call to invoke(), delegate to the StateHolder interface to get the Property for the invoked method</li> <li>Add an @AppliesTo annotation to the Mixin and implement the AppliesToFilter with a rule that http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/package.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/package.html b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/package.html index 658765d..5ebed41 100644 --- a/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/package.html +++ b/tutorials/composites/src/main/java/org/qi4j/tutorials/composites/tutorial9/package.html @@ -28,7 +28,7 @@ to the TransientComposite type. This forces the mixin to implement the Transient normally mean that it would have to implement all methods, including those found in the TransientComposite interface. However, since we are only really interested in implementing the say() method we will mark this by declaring that the Mixin "implements" the TransientComposite type, but is also "abstract". -This, using pure Java semantics, makes it possible to avoid having to implement all methods. Qi4j +This, using pure Java semantics, makes it possible to avoid having to implement all methods. Zest⢠will during the initialization phase detect that the Mixin only handles the say() method, and therefore only map it to that specific method. In order to instantiate the Mixin it will generate a subclass which implements the remaining methods in the TransientComposite type, as no-ops. These will never be called however, @@ -39,7 +39,7 @@ to be an Abstract Fragment. To hide the state from the client we need to use what is called Private Mixins. A Private Mixin is any mixin that is referenced by another Mixin by using the @This injection, but which is not included in the TransientComposite type. As long as there is a Mixin implementation declared for the interface specified -by the @This injection it will work, since Qi4j can know how to implement the interface. But since +by the @This injection it will work, since Zest⢠can know how to implement the interface. But since it is not extended by the TransientComposite type there is no way for a user of the TransientComposite to access it. That Mixin becomes an implementation detail. This can be used either for encapsulation purposes, or for referencing http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/composites/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/javadoc/overview.html b/tutorials/composites/src/main/javadoc/overview.html index 8103bc6..1b98252 100644 --- a/tutorials/composites/src/main/javadoc/overview.html +++ b/tutorials/composites/src/main/javadoc/overview.html @@ -21,15 +21,15 @@ <body> Description of tutorials. -<h2>Qi4j tutorials</h2> +<h2>Apache Zest⢠tutorials</h2> <h3>Composite tutorials</h3> <p> Throughout this set of tutorials it will be shown how to create and work with Composites, which -is the basic element in Qi4j. We will refactor one HelloWorld class to take advantage of the various -features in Qi4j. These refactorings will make it easier to reuse parts of the class, +is the basic element in Zestâ¢. We will refactor one HelloWorld class to take advantage of the various +features in Zestâ¢. These refactorings will make it easier to reuse parts of the class, and introduce new features without having to change existing code. We will also look -at some of the existing classes, or Fragments, available in Qi4j that you can reuse +at some of the existing classes, or Fragments, available in Zest⢠that you can reuse so that you don't have to write everything yourself. </p> <p> @@ -38,7 +38,7 @@ always look at the next tutorial step for guidance on what to do. </p> <h2>Related Documentation</h2> <p> -For more information on Qi4j see <a target="_blank" href="http://www.qi4j.org";>the website</a>. +For more information on Zest⢠see <a target="_blank" href="http://zest.apache.org";>the website</a>. </p> </body> </html> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/services/src/main/java/org/qi4j/tutorials/services/step1/package.html ---------------------------------------------------------------------- diff --git a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step1/package.html b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step1/package.html index cf280c7..a7b7805 100644 --- a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step1/package.html +++ b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step1/package.html @@ -22,14 +22,14 @@ limitations under the License. and return books. </p> <p> - Qi4j relies heavily on the use of interfaces. This makes it possible for an object + Apache Zest⢠relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of interfaces which internally is backed by a number of Mixins, some of which you may have written yourself, and some of which may have been reused. This is also true for services, which we are to cover in this tutorial. </p> <p> The first task is therefore to refactor the code so that the methods are implemented from an - interface instead, and to essentially make the identical "application" into a Qi4j application. + interface instead, and to essentially make the identical "application" into a Zest⢠application. We also want the Book to be a ValueComposite. </p> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/services/src/main/java/org/qi4j/tutorials/services/step2/package.html ---------------------------------------------------------------------- diff --git a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step2/package.html b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step2/package.html index a8a6b81..860150a 100644 --- a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step2/package.html +++ b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step2/package.html @@ -19,7 +19,7 @@ limitations under the License. <p> Services can be "<i>activated</i>" and "<i>passivated</i>". Applications can be notified of this occurring - by Qi4j runtime by assembling them with an <code>Activator</code>. + by Zest⢠runtime by assembling them with an <code>Activator</code>. </p> <p> Activators methods are called around "<i>activation</i>" and "<i>passivation</i>": <code>beforeActivation</code>, http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/247c146d/tutorials/services/src/main/java/org/qi4j/tutorials/services/step3/package.html ---------------------------------------------------------------------- diff --git a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step3/package.html b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step3/package.html index def8703..37436d9 100644 --- a/tutorials/services/src/main/java/org/qi4j/tutorials/services/step3/package.html +++ b/tutorials/services/src/main/java/org/qi4j/tutorials/services/step3/package.html @@ -18,14 +18,14 @@ limitations under the License. <h1>Step 3 - Reading the Service Configuration</h1> <p> - Services typically have configuration. Configurations are directly supported in Qi4j. A + Services typically have configuration. Configurations are directly supported in Zestâ¢. A <code>ConfigurationComposite</code> is a subtype of <code>EntityComposite</code>. That is because configurations are stored in EntityStores, can be modified in runtime by client code and has the same semantics as regular entities. </p> <p> - Qi4j also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is - not found in the configured entity store, then Qi4j will automatically locate a properties file for each + Zest⢠also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is + not found in the configured entity store, then Zest⢠will automatically locate a properties file for each service instance, read those properties into a ConfigurationComposite instance, save that to the entity store and provide the values to the service. The properties file must be with the same name as the service instance with the extension <code>"properties"</code> in the same package as the service.
