Repository: zest-qi4j Updated Branches: refs/heads/develop 5f6db271f -> cccbc92db
ZEST-40 Various Qi4j -> Zest renames and links fixes Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/6413657c Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/6413657c Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/6413657c Branch: refs/heads/develop Commit: 6413657cdd294d35cfc779ee682c9cfe29c47c90 Parents: 5f6db27 Author: Paul Merlin <[email protected]> Authored: Wed Jul 8 16:21:52 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Wed Jul 8 16:23:38 2015 +0200 ---------------------------------------------------------------------- README.txt | 4 +- doap.rdf | 2 +- .../library/constraints/TestCaseComposite.java | 6 +- .../tutorials/howto-assembly-application.txt | 2 +- .../src/docs/tutorials/howto-build-system.txt | 10 +- .../docs/tutorials/howto-configure-service.txt | 2 +- .../tutorials/howto-contextual-fragments.txt | 2 +- .../src/docs/tutorials/howto-create-concern.txt | 2 +- .../docs/tutorials/howto-create-constraint.txt | 2 +- .../src/docs/tutorials/howto-create-entity.txt | 2 +- .../docs/tutorials/howto-create-sideeffect.txt | 2 +- .../src/docs/tutorials/howto-depend-on-qi4j.txt | 199 ------------------- .../src/docs/tutorials/howto-depend-on-zest.txt | 193 ++++++++++++++++++ .../tutorials/howto-leverage-properties.txt | 2 +- manual/src/docs/tutorials/howto-use-io.txt | 2 +- .../src/docs/tutorials/howto-writing-docs.txt | 16 +- manual/src/docs/userguide/core.txt | 4 +- manual/src/docs/userguide/libraries.txt | 1 - manual/src/docs/website/javadocs.txt | 40 ++-- manual/src/docs/website/samples.txt | 14 +- manual/src/docs/website/tutorials.txt | 6 +- .../src/resources/js/progressive-enhancement.js | 33 ++- .../sample_a/communication/web/BasePage.html | 10 +- .../sample_b/communication/web/BasePage.html | 10 +- src/bin-dist/README.txt | 2 +- .../composites/src/docs/tut-composites.txt | 4 +- .../tenminutes/src/docs/ten-minutes.txt | 4 +- .../thirtyminutes/src/docs/thirty-minutes.txt | 4 +- .../twominutes/src/docs/two-minutes.txt | 4 +- tutorials/services/src/docs/tut-services.txt | 2 +- 30 files changed, 307 insertions(+), 279 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/README.txt ---------------------------------------------------------------------- diff --git a/README.txt b/README.txt index b29fa2d..06023f1 100644 --- a/README.txt +++ b/README.txt @@ -38,7 +38,7 @@ If you need to go offline type `./gradlew gooffline` to ensure all needed dependencies are cached by Gradle. If you prefer to use a dependency management system, go to: -https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html +https://zest.apache.org/java/latest/howto-depend-on-zest.html Building Apache Zest @@ -47,7 +47,7 @@ To build Zest⢠from sources you only need to have a valid Java JDK >= 7 installation. This document the Zest⢠build system and its usage: -https://zest.apache.org/qi4j/latest/build-system.html +https://zest.apache.org/java/latest/build-system.html Thank you for trying out Apache Zest⢠and Composite Oriented Programming. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/doap.rdf ---------------------------------------------------------------------- diff --git a/doap.rdf b/doap.rdf index c39ac4b..5c24e5f 100644 --- a/doap.rdf +++ b/doap.rdf @@ -46,7 +46,7 @@ </description> <bug-database rdf:resource="http://issues.apache.org/jira/browse/ZEST"; /> <mailing-list rdf:resource="http://zest.apache.org/community/get_help.html"; /> - <download-page rdf:resource="http://zest.apache.org/downloads.html"; /> + <download-page rdf:resource="http://zest.apache.org/download.html"; /> <programming-language>Java</programming-language> <programming-language>C#</programming-language> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java b/libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java index 69343e6..68777f3 100644 --- a/libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java +++ b/libraries/constraints/src/test/java/org/qi4j/library/constraints/TestCaseComposite.java @@ -17,7 +17,9 @@ import java.util.List; import org.qi4j.api.composite.TransientComposite; import org.qi4j.api.mixin.Mixins; import org.qi4j.api.property.Property; -import org.qi4j.library.constraints.annotation.*; + // START SNIPPET: constraints + import org.qi4j.library.constraints.annotation.*; + // END SNIPPET: constraints /** * Test composite with all the constraints @@ -56,7 +58,7 @@ public interface TestCaseComposite extends TransientComposite @OneOf( { "Bar", "Xyzzy" } ) Property<String> oneOf(); - void testParameters(@GreaterThan(10) Integer greaterThan); + void testParameters( @GreaterThan( 10 ) Integer greaterThan ); // END SNIPPET: constraints abstract class TestCaseMixin http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-assembly-application.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-assembly-application.txt b/manual/src/docs/tutorials/howto-assembly-application.txt index e42a5cd..05e2ad7 100644 --- a/manual/src/docs/tutorials/howto-assembly-application.txt +++ b/manual/src/docs/tutorials/howto-assembly-application.txt @@ -23,7 +23,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == Basics == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-build-system.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt index e0008eb..6730a38 100644 --- a/manual/src/docs/tutorials/howto-build-system.txt +++ b/manual/src/docs/tutorials/howto-build-system.txt @@ -25,7 +25,7 @@ It describe the Zest⢠SDK Build System from compilation to publication of arti applications. If instead you want to setup your project build system to depend on modules of the Zest⢠SDK see the -<<howto-depend-on-qi4j,dedicated tutorial>>. +<<howto-depend-on-zest,dedicated tutorial>>. == Gradle == @@ -72,7 +72,7 @@ check:: + -- Run the tests and other checks like checkstyle. -Reports are generated in +qi4j-sdk/build/reports+. +Reports are generated in +build/reports+. -- install:: @@ -87,14 +87,14 @@ buildAll:: + -- Produces all the archives, javadocs, manuals and website content. -The output is generated to +qi4j-sdk/build+. +The output is generated to +build+. -- release:: + -- Uploads the release artifacts to the distribution servers and creates the release output into the -+qi4j-sdk/build/distributions+ directory. ++build/distributions+ directory. -- @@ -131,7 +131,7 @@ If a +version+ property is not defined, the build system will refuse to make a r == Tests == -NOTE: See the http://qi4j.org/community/ci.html[Zest⢠Continuous Integration] for current tests results +NOTE: See the https://builds.apache.org/view/S-Z/view/Zest/[Zest⢠Continuous Integration] for current tests results // TODO http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-configure-service.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-configure-service.txt b/manual/src/docs/tutorials/howto-configure-service.txt index 8776e79..86751b5 100644 --- a/manual/src/docs/tutorials/howto-configure-service.txt +++ b/manual/src/docs/tutorials/howto-configure-service.txt @@ -25,7 +25,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == We need a Service == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-contextual-fragments.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-contextual-fragments.txt b/manual/src/docs/tutorials/howto-contextual-fragments.txt index 40573c9..1dc423c 100644 --- a/manual/src/docs/tutorials/howto-contextual-fragments.txt +++ b/manual/src/docs/tutorials/howto-contextual-fragments.txt @@ -29,7 +29,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. The mixins, sideeffects and concerns are added during the bootstrap phase. It is very straight-forward; http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-create-concern.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-concern.txt b/manual/src/docs/tutorials/howto-create-concern.txt index 64cfde8..a36ea99 100644 --- a/manual/src/docs/tutorials/howto-create-concern.txt +++ b/manual/src/docs/tutorials/howto-create-concern.txt @@ -26,7 +26,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == Typed Concern == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-create-constraint.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-constraint.txt b/manual/src/docs/tutorials/howto-create-constraint.txt index 7ed09e5..23dfab7 100644 --- a/manual/src/docs/tutorials/howto-create-constraint.txt +++ b/manual/src/docs/tutorials/howto-create-constraint.txt @@ -26,7 +26,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == Method Constraint == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-create-entity.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-entity.txt b/manual/src/docs/tutorials/howto-create-entity.txt index 70e3148..41ffe94 100644 --- a/manual/src/docs/tutorials/howto-create-entity.txt +++ b/manual/src/docs/tutorials/howto-create-entity.txt @@ -26,7 +26,7 @@ include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] Moreover, you'll need an EntityStore for persistence and an Indexing engine for querying. Choose among the available implementations listed in the <<extensions>> section. -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == Basics First == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-create-sideeffect.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-sideeffect.txt b/manual/src/docs/tutorials/howto-create-sideeffect.txt index 6e3b6f0..2675168 100644 --- a/manual/src/docs/tutorials/howto-create-sideeffect.txt +++ b/manual/src/docs/tutorials/howto-create-sideeffect.txt @@ -26,7 +26,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/bootstrap/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. == Typed SideEffect == http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-depend-on-qi4j.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-depend-on-qi4j.txt b/manual/src/docs/tutorials/howto-depend-on-qi4j.txt deleted file mode 100644 index 938ce0c..0000000 --- a/manual/src/docs/tutorials/howto-depend-on-qi4j.txt +++ /dev/null @@ -1,199 +0,0 @@ -/////////////////////////////////////////////////////////////// - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. -/////////////////////////////////////////////////////////////// - -[[howto-depend-on-qi4j,Depend on Zest⢠in your build]] -= Depend on Zest⢠in your build = - -NOTE: Some of the <<libraries>> and <<extensions>> depend on artifacts that are not deployed in central, you'll need to -add other repositories to your build scripts accordingly. - -Release artifacts, including sources and javadoc, are deployed to - -https://repository-qi4j.forge.cloudbees.com/release/[https://repository-qi4j.forge.cloudbees.com/release/]. - -Snapshot artifacts, including sources and javadoc, are built against the `develop` branch and deployed weekly to - -https://repository-qi4j.forge.cloudbees.com/snapshot/[https://repository-qi4j.forge.cloudbees.com/snapshot/]. - -As they are not deployed to central you need to add the repositories to your build scripts. - - -== Manually == - -If you don't rely on your build scripts dependency resolution mechanism you should -http://qi4j.org/downloads.html[download] the SDK distribution. - -== Using Maven == - -First you need to register the Zest⢠repositories: - -[source,xml] ----- -<repositories> - <repository> - <id>qi4j-releases</id> - <url>https://repository-qi4j.forge.cloudbees.com/release/</url> - </repository> - <repository> - <id>qi4j-snapshots</id> - <url>https://repository-qi4j.forge.cloudbees.com/snapshot/</url> - <releases><enabled>false</enabled></releases> - <snapshots><enabled>true</enabled></snapshots> - </repository> -</repositories> ----- - -After that you can declare dependencies on Zest⢠artifacts: - -[source,xml] ----- -<dependencies> - <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.bootstrap</artifactId> - <version>QI4J_VERSION</version> - </dependency> - <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.runtime</artifactId> - <version>QI4J_VERSION</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.testsupport</artifactId> - <version>QI4J_VERSION</version> - <scope>test</scope> - </dependency> -</dependencies> ----- - -Where `QI4J_VERSION` is the Zest⢠version you want to use. - -== Using Gradle == - -First you need to register the Zest⢠repositories: - -[source,groovy] ----- -repositories { - maven { name 'qi4j-releases'; url "https://repository-qi4j.forge.cloudbees.com/release/" } - maven { name 'qi4j-snapshots'; url "https://repository-qi4j.forge.cloudbees.com/snapshot/"; } -} ----- - -After that you can declare dependencies on Zest⢠artifacts: - -[source,groovy] ----- -dependencies { - compile "org.qi4j.core:org.qi4j.core.bootstrap:QI4J_VERSION" - runtime "org.qi4j.core:org.qi4j.core.runtime:QI4J_VERSION" - testCompile "org.qi4j.core:org.qi4j.core.testsupport:QI4J_VERSION" -} ----- - -Where `QI4J_VERSION` is the Zest⢠version you want to use. - -== Using Buildr == - -First you need to register the Zest⢠repositories: - -[source,ruby] ----- -repositories.remote << 'https://repository-qi4j.forge.cloudbees.com/release/' -repositories.remote << 'https://repository-qi4j.forge.cloudbees.com/snapshot/' ----- - -After that you can declare dependencies on Zest⢠artifacts: - -[source,ruby] ----- -compile.with 'org.qi4j.core:org.qi4j.core.bootstrap:QI4J_VERSION' -package(:war).with :libs => 'org.qi4j.core:org.qi4j.core.runtime:QI4J_VERSION' -test.with 'org.qi4j.core:org.qi4j.core.testsupport:QI4J_VERSION' ----- - -Where `QI4J_VERSION` is the Zest⢠version you want to use. - -== Using SBT == - -First you need to register the Zest⢠repositories: - -[source,scala] ----- -resolvers += "qi4j-releases" at "https://repository-qi4j.forge.cloudbees.com/release/"; - -resolvers += "qi4j-snapshots" at "https://repository-qi4j.forge.cloudbees.com/snapshot/"; ----- - -After that you can declare dependencies on Zest⢠artifacts: - -[source,scala] ----- -libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.bootstrap" % "QI4J_VERSION" \ - withSources() withJavadoc() -libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.runtime" % "QI4J_VERSION" % "runtime" \ - withSources() withJavadoc() -libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.testsupport" % "QI4J_VERSION" % "test" \ - withSources() withJavadoc() ----- - -Where `QI4J_VERSION` is the Zest⢠version you want to use. - -== Using Ivy == - -First you need to register the Zest⢠repositories in a `ivysettings.xml` file: - -[source,xml] ----- -<ivysettings> - <settings defaultResolver="chain"/> - <resolvers> - <chain name="chain"> - <ibiblio name="qi4j-releases" m2compatible="true" - root="https://repository-qi4j.forge.cloudbees.com/release/"/> - <ibiblio name="qi4j-snapshots" m2compatible="true" - root="https://repository-qi4j.forge.cloudbees.com/snapshot/"/> - </chain> - </resolvers> -</ivysettings> ----- - -After that you can declare dependencies on Zest⢠artifacts: - -[source,xml] ----- -<ivy-module> - <dependencies> - <dependency org="org.qi4j.core" name="org.qi4j.core.bootstrap" - rev="QI4J_VERSION" conf="default" /> - <dependency org="org.qi4j.core" name="org.qi4j.core.runtime" - rev="QI4J_VERSION" conf="runtime" /> - <dependency org="org.qi4j.core" name="org.qi4j.core.testsupport" - rev="QI4J_VERSION" conf="test" /> - </dependencies> -</ivy-module> ----- - -Where `QI4J_VERSION` is the Zest⢠version you want to use. - http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-depend-on-zest.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-depend-on-zest.txt b/manual/src/docs/tutorials/howto-depend-on-zest.txt new file mode 100644 index 0000000..1d0b629 --- /dev/null +++ b/manual/src/docs/tutorials/howto-depend-on-zest.txt @@ -0,0 +1,193 @@ +/////////////////////////////////////////////////////////////// + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +/////////////////////////////////////////////////////////////// + +[[howto-depend-on-zest,Depend on Zest⢠in your build]] += Depend on Zest⢠in your build = + +NOTE: Some of the <<libraries>> and <<extensions>> depend on artifacts that are not deployed in central, you'll need to +add other repositories to your build scripts accordingly. + +Release artifacts, including sources and javadoc, are deployed to Maven Central: + +http://repo1.maven.org/maven2/ (US) + +http://uk.maven.org/maven2/ (Europe) + +Snapshot artifacts, including sources and javadoc, are built against the `develop` branch and deployed weekly to the Apache SNAPSHOTS repository: + +http://repository.apache.org/snapshots/ + + +== Manually == + +If you don't rely on your build scripts dependency resolution mechanism you should +https://zest.apache.org/download.html[download] the SDK distribution. + + +== Using Maven == + +You simply declare dependencies on Zest⢠artifacts: + +[source,xml] +---- +<dependencies> + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.bootstrap</artifactId> + <version>ZEST_VERSION</version> + </dependency> + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.runtime</artifactId> + <version>ZEST_VERSION</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.qi4j.core</groupId> + <artifactId>org.qi4j.core.testsupport</artifactId> + <version>ZEST_VERSION</version> + <scope>test</scope> + </dependency> +</dependencies> +---- + +Where `ZEST_VERSION` is the Zest⢠version you want to use. + +If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository: + +[source,xml] +---- +<repositories> + <repository> + <id>apache-snapshots</id> + <url>https://repository.apache.org/snapshots/</url> + <releases><enabled>false</enabled></releases> + <snapshots><enabled>true</enabled></snapshots> + </repository> +</repositories> +---- + + +== Using Gradle == + +You simply declare dependencies on Zest⢠artifacts: + +[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" +} +---- + +Where `ZEST_VERSION` is the Zest⢠version you want to use. + +If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository: + +[source,groovy] +---- +repositories { + maven { name 'apache-snapshots'; url "https://repository.apache.org/snapshots/"; } +} +---- + + +== Using Buildr == + +You simply declare dependencies on Zest⢠artifacts: + +[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' +---- + +Where `ZEST_VERSION` is the Zest⢠version you want to use. + +If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository: + +[source,ruby] +---- +repositories.remote << 'https://repository.apache.org/snapshots/' +---- + + +== Using SBT == + +You simply declare dependencies on Zest⢠artifacts: + +[source,scala] +---- +libraryDependencies += \ + "org.qi4j.core" % "org.qi4j.core.bootstrap" % "ZEST_VERSION" \ + withSources() withJavadoc() +libraryDependencies += \ + "org.qi4j.core" % "org.qi4j.core.runtime" % "ZEST_VERSION" % "runtime" \ + withSources() withJavadoc() +libraryDependencies += \ + "org.qi4j.core" % "org.qi4j.core.testsupport" % "ZEST_VERSION" % "test" \ + withSources() withJavadoc() +---- + +Where `ZEST_VERSION` is the Zest⢠version you want to use. + +If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository: + +[source,scala] +---- +resolvers += "apache-snapshots" at "https://repository.apache.org/snapshots/"; +---- + + +== Using Ivy == + +You simply declare dependencies on Zest⢠artifacts: + +[source,xml] +---- +<ivy-module> + <dependencies> + <dependency org="org.qi4j.core" name="org.qi4j.core.bootstrap" + rev="ZEST_VERSION" conf="default" /> + <dependency org="org.qi4j.core" name="org.qi4j.core.runtime" + rev="ZEST_VERSION" conf="runtime" /> + <dependency org="org.qi4j.core" name="org.qi4j.core.testsupport" + rev="ZEST_VERSION" conf="test" /> + </dependencies> +</ivy-module> +---- + +Where `ZEST_VERSION` is the Zest⢠version you want to use. + +If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository in a `ivysettings.xml` file: + +[source,xml] +---- +<ivysettings> + <settings defaultResolver="chain"/> + <resolvers> + <chain name="chain"> + <ibiblio name="apache-snapshots" m2compatible="true" + root="https://repository.apache.org/snapshots/"/> + </chain> + </resolvers> +</ivysettings> +---- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-leverage-properties.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-leverage-properties.txt b/manual/src/docs/tutorials/howto-leverage-properties.txt index 8cc1c7b..1934f8c 100644 --- a/manual/src/docs/tutorials/howto-leverage-properties.txt +++ b/manual/src/docs/tutorials/howto-leverage-properties.txt @@ -24,7 +24,7 @@ If you want to reproduce what's explained in this tutorial, remember to depend o include::../../../../core/api/build/docs/buildinfo/artifact.txt[] -At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details. +At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-zest>> tutorial for details. So in Zest, instead of writing; http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-use-io.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-use-io.txt b/manual/src/docs/tutorials/howto-use-io.txt index 6d307cc..7eaecf6 100644 --- a/manual/src/docs/tutorials/howto-use-io.txt +++ b/manual/src/docs/tutorials/howto-use-io.txt @@ -80,7 +80,7 @@ on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs: include::../../../../core/runtime/build/docs/buildinfo/artifact.txt[] -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. Once theses parts were identified it was mostly just a matter of putting interfaces on these pieces, and making sure they can be easily used in many different situations. The result is as follows. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/tutorials/howto-writing-docs.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-writing-docs.txt b/manual/src/docs/tutorials/howto-writing-docs.txt index 14ed48c..27e0ef9 100644 --- a/manual/src/docs/tutorials/howto-writing-docs.txt +++ b/manual/src/docs/tutorials/howto-writing-docs.txt @@ -40,7 +40,7 @@ source code in the documentation, since any refactoring will be reflected in the The above files are all consumed by the build of the manual (by adding them as dependencies). To get content included in the manual, it has to be explicitly included by a document in the manual as well. -The whole documentation set is generated from the _*manual*_ module in the +qi4j-sdk+, and we are currently only creating the website. +The whole documentation set is generated from the _*manual*_ module in the SDK, and we are currently only creating the website. The User Guide and Reference Manual are future projects. == Headings and document structure == @@ -124,28 +124,28 @@ External links are added like this: [source] ---- -http://www.qi4j.org/[Link text here] +https://zest.apache.org/[Link text here] ---- -Which renders like: http://www.qi4j.org/[Link text here] +Which renders like: https://zest.apache.org/[Link text here] For short links it may be better not to add a link text, just do: [source] ---- -http://www.qi4j.org/ +https://zest.apache.org/ ---- -Which renders like: http://www.qi4j.org/ +Which renders like: https://zest.apache.org/ It's ok to have a dot right after the URL, it won't be part of the link. [source] ---- -http://www.qi4j.org/. +https://zest.apache.org/. ---- -Which renders like: http://www.qi4j.org/. +Which renders like: https://zest.apache.org/. == Text Formatting == @@ -228,7 +228,7 @@ Most source code that is included in the documentation should be extract via +SN ----------- ---- -The source file is relative to the +qi4j-sdk+ root, and the 'tag' is defined in the source file. +The source file is relative to the SDK root, and the 'tag' is defined in the source file. The above could be bringing in content that looks like; [source] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/userguide/core.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/userguide/core.txt b/manual/src/docs/userguide/core.txt index 6f046c8..b6d77de 100644 --- a/manual/src/docs/userguide/core.txt +++ b/manual/src/docs/userguide/core.txt @@ -87,7 +87,7 @@ possibly with transformations and filtering along the way. //*<<core-spi,Core Extension SPI>>* === Core Extension SPI === //____ -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. @@ -98,7 +98,7 @@ applications during the bootstrap phase. === Core Runtime === //____ Your code should *never*, *ever*, have a dependency on Zest⢠Core Runtime. If you think you need this, you should -probably contact qi4j-dev forum at Google Groups and see if your usecase can either be solved in a existing way or +probably contact [email protected] and see if your usecase can either be solved in a existing way or perhaps that a new Core Extension SPI is needed. <<core-runtime,Learn more>> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/userguide/libraries.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/userguide/libraries.txt b/manual/src/docs/userguide/libraries.txt index 284154d..742dcbf 100644 --- a/manual/src/docs/userguide/libraries.txt +++ b/manual/src/docs/userguide/libraries.txt @@ -29,7 +29,6 @@ how good the codebase, documentation and unit tests are for each of the librarie potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation for our users. - :leveloffset: 2 include::../../../../libraries/alarm/src/docs/alarm.txt[] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/website/javadocs.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/website/javadocs.txt b/manual/src/docs/website/javadocs.txt index 2534445..690ee09 100644 --- a/manual/src/docs/website/javadocs.txt +++ b/manual/src/docs/website/javadocs.txt @@ -24,23 +24,37 @@ == JavaDocs == +In this section you will find links to JavaDocs corresponding to this Apache Zest⢠(Java Edition) version ({revnumber}), to some alias versions, and finally, to previous releases. + +=== Apache Zest⢠(Java Edition) {revnumber} === + +// JavaDocs for Apache Zest⢠(Java Edition) {revnumber}: + +* link:javadocs/index.html[Release {revnumber}] + + === Alias Versions === -* link:../latest/javadocs/index.html[Latest Release == Master Branch] -* link:../develop/javadocs/index.html[Develop Branch] +Links to _"alias versions"_ JavaDocs: + +* https://zest.apache.org/java/latest/javadocs/[Latest Release (`master` branch)] +* https://zest.apache.org/java/develop/javadocs/[Development (`develop` branch)] + + +=== Previous Releases === -=== Releases === +Archived JavaDocs of previous releases: -* link:../2.0/javadocs/index.html[Release 2.0] -* link:../1.4.1/javadocs/index.html[Release 1.4.1] -* link:../1.4/javadocs/index.html[Release 1.4] -* link:../1.3/javadocs/index.html[Release 1.3] +* https://zest.apache.org/java/2.0/javadocs/[Release 2.0] +* https://zest.apache.org/java/1.4.1/javadocs/[Release 1.4.1] +* https://zest.apache.org/java/1.4/javadocs/[Release 1.4] +* https://zest.apache.org/java/1.3/javadocs/[Release 1.3] * Release 1.2 -** link:../1.2/javadocs/api[Core API] -** link:../1.2/javadocs/bootstrap[Core Bootstrap] -** link:../1.2/javadocs/spi[Core SPI] +** https://zest.apache.org/java/1.2/javadocs/api[Core API] +** https://zest.apache.org/java/1.2/javadocs/bootstrap[Core Bootstrap] +** https://zest.apache.org/java/1.2/javadocs/spi[Core SPI] * Release 1.0 -** link:../1.0/javadocs/api[Core API] -** link:../1.0/javadocs/bootstrap[Core Bootstrap] -** link:../1.0/javadocs/spi[Core SPI] +** https://zest.apache.org/java/1.0/javadocs/api[Core API] +** https://zest.apache.org/java/1.0/javadocs/bootstrap[Core Bootstrap] +** https://zest.apache.org/java/1.0/javadocs/spi[Core SPI] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/website/samples.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/website/samples.txt b/manual/src/docs/website/samples.txt index f029138..39df02c 100644 --- a/manual/src/docs/website/samples.txt +++ b/manual/src/docs/website/samples.txt @@ -35,7 +35,7 @@ The samples are available in the +samples/+ directory of the Zest⢠SDK. Sample of how DCI (Data, Context & Interaction) pattern is implemented using Zest⢠core only. -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/dci[Browse Source] [[sample-dci-cargo,DCI Cargo Sample]] == DCI Cargo Sample == @@ -46,7 +46,7 @@ Zestâ¢, for Eric Evans DDD sample. This sample, contributed by Marc Grue, is described in details on his website: http://marcgrue.com/ -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci-cargo[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/dci-cargo[Browse Source] [[sample-forum,Forum Sample]] == Forum Sample == @@ -54,7 +54,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci-cargo[Browse Source] Sample of how to build a web forum using <<library-rest-server>>, <<extension-es-file>> and <<library-fileconfig>>. -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/forum[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/forum[Browse Source] [[sample-car-rental,Car Rental Sample]] == Car Rental Sample == @@ -62,14 +62,14 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/forum[Browse Source] Sample of implementation of a Car Rental application implemented as a Servlet based Webapp packaged as a WAR. -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/rental[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/rental[Browse Source] // [[sample-scala,Scala Sample]] // == Scala Sample == // // Sample of how to use Scala with Zestâ¢. // -// https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/scala[Browse Source] +// https://github.com/apache/zest-qi4j/tree/develop/samples/scala[Browse Source] [[sample-sql-support,SQL Support Sample]] == SQL Support Sample == @@ -78,7 +78,7 @@ NOTE: This sample use PostgreSQL and drop all of its data once run in order to b Sample of how to fully use Zest⢠SQL support : <<library-sql>>, <<extension-es-sql>> and <<extension-indexing-sql>>. -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/sql-support[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/sql-support[Browse Source] Here are the steps needed to setup the database using the `psql` utility command: @@ -106,4 +106,4 @@ A gradle task `runSample` is defined in this module as a shortcut to run the exa Sample of how to write custom binders. -https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/swing[Browse Source] +https://github.com/apache/zest-qi4j/tree/develop/samples/swing[Browse Source] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/docs/website/tutorials.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/website/tutorials.txt b/manual/src/docs/website/tutorials.txt index 8e2d9ce..9d752f5 100644 --- a/manual/src/docs/website/tutorials.txt +++ b/manual/src/docs/website/tutorials.txt @@ -25,7 +25,7 @@ == Overview == TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the -http://qi4j.org/downloads.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to +https://zest.apache.org/download.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to this tutorial, run it and play with it. In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Zestâ¢. @@ -48,7 +48,7 @@ Throughout this set of tutorials it will be shown how to depend on Zest⢠in yo application, how to create and work with Composites and Services, how to use contextual fragments and leverage properties. -- <<howto-depend-on-qi4j>> +- <<howto-depend-on-zest>> - <<howto-assemble-application>> - <<tut-composites>> - <<tut-services>> @@ -94,7 +94,7 @@ include::../../../../tutorials/introduction/twohours/src/docs/two-hours.txt[] :leveloffset: 2 -include::../tutorials/howto-depend-on-qi4j.txt[] +include::../tutorials/howto-depend-on-zest.txt[] :leveloffset: 2 http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/manual/src/resources/js/progressive-enhancement.js ---------------------------------------------------------------------- diff --git a/manual/src/resources/js/progressive-enhancement.js b/manual/src/resources/js/progressive-enhancement.js index 6f183d9..17d899f 100644 --- a/manual/src/resources/js/progressive-enhancement.js +++ b/manual/src/resources/js/progressive-enhancement.js @@ -23,6 +23,8 @@ */ $( document ).ready( function($){ + var atHome = window.location.hostname == "zest.apache.org" + /** * Glossary. */ @@ -88,13 +90,13 @@ $( document ).ready( function($){ $( "div.logo" ).append( switcher_html ); var toURL = function( displayName ) { - if( window.location.hostname == "zest.apache.org" ) + if( atHome ) { return "../" + versions[ displayName ]; } else { - return "https://zest.apache.org/qi4j/"; + versions[ displayName ]; + return "https://zest.apache.org/java/"; + versions[ displayName ]; } } $( "div.logo select" ).change( function() @@ -108,20 +110,37 @@ $( document ).ready( function($){ } } ); - // Add separator space between tutorials series + // Enhance left nav $( "div.sub-nav div.toc dt" ).each( function( idx, dt ) { var $dt = $( dt ); var item = $dt.find( "span.section:first-child" ).text().trim(); switch( item ) { - case "Qi4j in 2 minutes": - $dt.attr( "style", "margin-top: 24px" ); - break; - case "Qi4j in 2 hours": + // Overview everywhere + case "Overview": + $dt.attr( "style", "margin-bottom: 24px" ); + // Tutorials + case "Zest\u2122 in 2 hours": case "Leverage Properties": case "Use I/O API": $dt.attr( "style", "margin-bottom: 24px" ); break; + // JavaDocs + case "JavaDocs": + $dt.hide(); + break; + // Libraries + case "Alarms": + $dt.attr( "style", "margin-top: 24px" ); + break; + // Extensions + case "Ehcache Cache": + case "Memory EntityStore": + case "ElasticSearch Index/Query": + case "Yammer Metrics": + case "Migration": + $dt.attr( "style", "margin-top: 24px" ); + break; } } ); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/samples/dci-cargo/dcisample_a/src/main/resources/org/qi4j/sample/dcicargo/sample_a/communication/web/BasePage.html ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/qi4j/sample/dcicargo/sample_a/communication/web/BasePage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/qi4j/sample/dcicargo/sample_a/communication/web/BasePage.html index 7d4dc5c..bdbf839 100644 --- a/samples/dci-cargo/dcisample_a/src/main/resources/org/qi4j/sample/dcicargo/sample_a/communication/web/BasePage.html +++ b/samples/dci-cargo/dcisample_a/src/main/resources/org/qi4j/sample/dcicargo/sample_a/communication/web/BasePage.html @@ -55,11 +55,11 @@ <a href="http://tech.groups.yahoo.com/group/domaindrivendesign/"; target="_blank">Forum</a> </td> <td valign="top"> - <a href="http://www.qi4j.org/"; target="_blank">Website</a><br> - <a href="http://old.nabble.com/Qi4j-dev-f33137.html"; target="_blank">Forum</a><br> - <a href="http://www.qi4j.org/qi4j/downloads.html"; target="_blank">Download</a><br> - <a href="http://repository.ops4j.org/maven2/org/qi4j/"; target="_blank">Maven</a><br> - <a href="https://github.com/qi4j"; target="_blank">Github</a> + <a href="https://zest.apache.org/"; target="_blank">Website</a><br> + <a href="https://zest.apache.org/community/get_help.html"; target="_blank">Forum</a><br> + <a href="https://zest.apache.org/download.html"; target="_blank">Download</a><br> + <a href="https://zest.apache.org/java/latest/howto-depend-on-zest.html"; target="_blank">Maven</a><br> + <a href="https://github.com/apache/zest-qi4j"; target="_blank">Github</a> </td> <td valign="top"> <a href="http://wicket.apache.org/"; target="_blank">Website</a><br> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/samples/dci-cargo/dcisample_b/src/main/resources/org/qi4j/sample/dcicargo/sample_b/communication/web/BasePage.html ---------------------------------------------------------------------- diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/qi4j/sample/dcicargo/sample_b/communication/web/BasePage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/qi4j/sample/dcicargo/sample_b/communication/web/BasePage.html index 05e4e7c..75e6c5d 100644 --- a/samples/dci-cargo/dcisample_b/src/main/resources/org/qi4j/sample/dcicargo/sample_b/communication/web/BasePage.html +++ b/samples/dci-cargo/dcisample_b/src/main/resources/org/qi4j/sample/dcicargo/sample_b/communication/web/BasePage.html @@ -56,11 +56,11 @@ <a href="http://tech.groups.yahoo.com/group/domaindrivendesign/"; target="_blank">Forum</a> </td> <td valign="top"> - <a href="http://www.qi4j.org/"; target="_blank">Website</a><br> - <a href="http://old.nabble.com/Qi4j-dev-f33137.html"; target="_blank">Forum</a><br> - <a href="http://www.qi4j.org/qi4j/downloads.html"; target="_blank">Download</a><br> - <a href="http://repository.ops4j.org/maven2/org/qi4j/"; target="_blank">Maven</a><br> - <a href="https://github.com/qi4j"; target="_blank">Github</a> + <a href="https://zest.apache.org/"; target="_blank">Website</a><br> + <a href="https://zest.apache.org/community/get_help.html"; target="_blank">Forum</a><br> + <a href="https://zest.apache.org/download.html"; target="_blank">Download</a><br> + <a href="https://zest.apache.org/java/latest/howto-depend-on-zest.html"; target="_blank">Maven</a><br> + <a href="https://github.com/apache/zest-qi4j"; target="_blank">Github</a> </td> <td valign="top"> <a href="http://wicket.apache.org/"; target="_blank">Website</a><br> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/src/bin-dist/README.txt ---------------------------------------------------------------------- diff --git a/src/bin-dist/README.txt b/src/bin-dist/README.txt index 48d7cbd..e83242a 100644 --- a/src/bin-dist/README.txt +++ b/src/bin-dist/README.txt @@ -40,7 +40,7 @@ distribution's root, you'll find both Maven (go-offline.pom) and Gradle needed dependencies jars. Instructions are given into theses files. If you prefer to use a dependency management system, go to: -https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html +https://zest.apache.org/java/latest/howto-depend-on-zest.html Thank you for trying out Apache Zest⢠and Composite Oriented Programming. http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/tutorials/composites/src/docs/tut-composites.txt ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/docs/tut-composites.txt b/tutorials/composites/src/docs/tut-composites.txt index 1020d93..6077467 100644 --- a/tutorials/composites/src/docs/tut-composites.txt +++ b/tutorials/composites/src/docs/tut-composites.txt @@ -21,7 +21,7 @@ = Transient Composites Tutorial = TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the -http://qi4j.org/downloads.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to +https://zest.apache.org/download.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to this tutorial, run it and play with it. Throughout this set of tutorials it will be shown how to create and work with Composites, which @@ -52,7 +52,7 @@ on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs: include::../../../../core/runtime/build/docs/buildinfo/artifact.txt[] -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. :leveloffset: 3 http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt ---------------------------------------------------------------------- diff --git a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt index baca4b6..dc86b5f 100644 --- a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt +++ b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt @@ -21,7 +21,7 @@ = Zest⢠in 10 minutes = TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the -http://qi4j.org/downloads.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to +https://zest.apache.org/download.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to this tutorial, run it and play with it. @@ -41,7 +41,7 @@ include::../../../../../core/runtime/build/docs/buildinfo/artifact.txt[] Moreover, you'll need an EntityStore for persistence and an Indexing engine for querying. Choose among the available implementations listed in the <<extensions>> section. -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. Composition is done with Java interfaces and Annotations. Example; [snippet,java] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt ---------------------------------------------------------------------- diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt index 55c9412..3913a9f 100644 --- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt +++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt @@ -21,7 +21,7 @@ = Zest⢠in 30 minutes = TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the -http://qi4j.org/downloads.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to +https://zest.apache.org/download.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to this tutorial, run it and play with it. @@ -36,7 +36,7 @@ include::../../../../../core/runtime/build/docs/buildinfo/artifact.txt[] Moreover, you'll need an EntityStore for persistence and an Indexing engine for querying. Choose among the available implementations listed in the <<extensions>> section. -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. We will go back to the OrderEntity example; [snippet,java] http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/tutorials/introduction/twominutes/src/docs/two-minutes.txt ---------------------------------------------------------------------- diff --git a/tutorials/introduction/twominutes/src/docs/two-minutes.txt b/tutorials/introduction/twominutes/src/docs/two-minutes.txt index 8720aaf..be502d2 100644 --- a/tutorials/introduction/twominutes/src/docs/two-minutes.txt +++ b/tutorials/introduction/twominutes/src/docs/two-minutes.txt @@ -21,7 +21,7 @@ = Zest⢠in 2 minutes = TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the -http://qi4j.org/downloads.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to +https://zest.apache.org/download.html[Zest⢠SDK sources]. You should start your favorite editor and find the code related to this tutorial, run it and play with it. To show that Zest⢠is not necessarily complex, not hard to get going with and easy to deploy, we are first showing the @@ -32,7 +32,7 @@ on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs: include::../../../../../core/runtime/build/docs/buildinfo/artifact.txt[] -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. Ready, Set, Go! http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/6413657c/tutorials/services/src/docs/tut-services.txt ---------------------------------------------------------------------- diff --git a/tutorials/services/src/docs/tut-services.txt b/tutorials/services/src/docs/tut-services.txt index 8edcdb7..8c85271 100644 --- a/tutorials/services/src/docs/tut-services.txt +++ b/tutorials/services/src/docs/tut-services.txt @@ -45,7 +45,7 @@ on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs: include::../../../../core/runtime/build/docs/buildinfo/artifact.txt[] -See the <<howto-depend-on-qi4j>> tutorial for details. +See the <<howto-depend-on-zest>> tutorial for details. :leveloffset: 3
