Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/f9cc087f Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/f9cc087f Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/f9cc087f Branch: refs/heads/develop Commit: f9cc087fe41e9aee391934461f33b05465f3973d Parents: 5d7118e cccbc92 Author: Niclas Hedhman <[email protected]> Authored: Thu Jul 9 10:03:52 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Thu Jul 9 10:03:52 2015 +0300 ---------------------------------------------------------------------- README.txt | 4 +- build.gradle | 3 + buildSrc/src/javadoc/overview.html | 4 +- core/api/src/docs/api.txt | 2 +- core/api/src/docs/application.txt | 12 +- doap.rdf | 2 +- .../library/constraints/TestCaseComposite.java | 6 +- libraries/lang-groovy/build.gradle | 1 + libraries/lang-groovy/dev-status.xml | 4 +- libraries/lang-groovy/src/docs/lang-groovy.txt | 87 ++++++-- .../org/qi4j/lang/groovy/GroovyComposite.java | 23 +++ .../org/qi4j/lang/groovy/GroovyMixinTest.java | 46 +++++ .../org/qi4j/lang/groovy/HelloSpeaker.java | 19 ++ .../qi4j/lang/groovy/HelloSpeakerMixin.groovy | 26 +++ .../org/qi4j/lang/groovy/HelloSpeakerTest.java | 79 ++++++++ .../groovy/org/qi4j/lang/groovy/Mixin1.java | 24 +++ .../org/qi4j/lang/groovy/GroovyComposite.java | 23 --- .../org/qi4j/lang/groovy/GroovyMixinTest.java | 46 ----- .../java/org/qi4j/lang/groovy/HelloSpeaker.java | 25 --- .../test/java/org/qi4j/lang/groovy/Mixin1.java | 24 --- .../org/qi4j/lang/groovy/HelloSpeaker.groovy | 25 +++ .../lang/groovy/HelloSpeaker.sayHello.groovy | 20 ++ .../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 | 23 +-- manual/src/docs/website/javadocs.txt | 40 ++-- manual/src/docs/website/samples.txt | 14 +- manual/src/docs/website/tutorials.txt | 6 +- manual/src/resources/images/logo-standard.png | Bin 20153 -> 10455 bytes .../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 +- 50 files changed, 665 insertions(+), 436 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f9cc087f/manual/src/docs/userguide/libraries.txt ----------------------------------------------------------------------
