You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/09/12 07:54:48 UTC

[isis] 01/01: Merge pull request #140 from apache/v2-antora

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit a25d03576b14ab8f27c855fc8fa17f8a9269c31e
Merge: 34a1818 afc9041
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 12 09:54:42 2019 +0200

    Merge pull request #140 from apache/v2-antora
    
    V2 antora

 antora/components/arch/antora.yml                  |   8 --
 antora/components/arch/modules/ROOT/nav.adoc       |   2 -
 .../components/arch/modules/ROOT/pages/about.adoc  |  37 -------
 .../demoapp/modules/ROOT/pages/about.adoc          |   2 +-
 .../downloads/modules/ROOT/pages/about.adoc        |   2 +-
 antora/components/extensions/antora.yml            |  12 +++
 .../components/{arch => extensions}/examples.csv   |   0
 .../modules/ROOT}/_attributes.adoc                 |   0
 antora/components/extensions/modules/ROOT/nav.adoc |   2 +
 .../modules/ROOT}/pages/_attributes.adoc           |   0
 .../modules/ROOT}/pages/_partials/_attributes.adoc |   0
 .../extensions/modules/ROOT/pages/about.adoc       |   3 +
 .../modules/asciidoc}/_attributes.adoc             |   0
 .../modules/asciidoc/assets/attachments}/.gitkeep  |   0
 .../modules/asciidoc}/assets/images/.gitkeep       |   0
 .../modules/asciidoc/examples}/.gitkeep            |   0
 .../extensions/modules/asciidoc/nav.adoc           |   2 +
 .../modules/asciidoc}/pages/_attributes.adoc       |   0
 .../asciidoc}/pages/_partials/_attributes.adoc     |   0
 .../modules/asciidoc/pages/about.adoc}             |   5 +-
 .../modules/fixtures}/_attributes.adoc             |   0
 .../modules/fixtures/assets/attachments}/.gitkeep  |   0
 .../modules/fixtures/assets/images}/.gitkeep       |   0
 .../modules/fixtures}/examples/.gitkeep            |   0
 .../extensions/modules/fixtures/nav.adoc           |   2 +
 .../modules/fixtures}/pages/_attributes.adoc       |   0
 .../fixtures}/pages/_partials/_attributes.adoc     |   0
 .../modules/fixtures/pages/about.adoc}             |   5 +-
 .../modules/markdown}/_attributes.adoc             |   0
 .../modules/markdown/assets/attachments}/.gitkeep  |   0
 .../modules/markdown/assets/images}/.gitkeep       |   0
 .../modules/markdown}/examples/.gitkeep            |   0
 .../extensions/modules/markdown/nav.adoc           |   2 +
 .../modules/markdown}/pages/_attributes.adoc       |   0
 .../markdown}/pages/_partials/_attributes.adoc     |   0
 .../modules/markdown/pages/about.adoc}             |   5 +-
 .../modules/secman}/_attributes.adoc               |   0
 .../modules/secman/assets/attachments}/.gitkeep    |   0
 .../modules/secman/assets/images}/.gitkeep         |   0
 .../modules/secman}/examples/.gitkeep              |   0
 .../components/extensions/modules/secman/nav.adoc  |   2 +
 .../modules/secman}/pages/_attributes.adoc         |   0
 .../secman}/pages/_partials/_attributes.adoc       |   0
 .../modules/secman/pages/about.adoc}               |   5 +-
 .../modules/specsupport}/_attributes.adoc          |   0
 .../specsupport/assets/attachments}/.gitkeep       |   0
 .../modules/specsupport/assets/images}/.gitkeep    |   0
 .../modules/specsupport}/examples/.gitkeep         |   0
 .../extensions/modules/specsupport/nav.adoc        |   2 +
 .../modules/specsupport}/pages/_attributes.adoc    |   0
 .../specsupport}/pages/_partials/_attributes.adoc  |   0
 .../modules/specsupport/pages/about.adoc}          |   5 +-
 .../modules/viewer-wicket-excel}/_attributes.adoc  |   0
 .../assets/attachments}/.gitkeep                   |   0
 .../viewer-wicket-excel/assets/images}/.gitkeep    |   0
 .../modules/viewer-wicket-excel}/examples/.gitkeep |   0
 .../modules/viewer-wicket-excel/nav.adoc           |   2 +
 .../viewer-wicket-excel}/pages/_attributes.adoc    |   0
 .../pages/_partials/_attributes.adoc               |   0
 .../modules/viewer-wicket-excel/pages/about.adoc}  |   5 +-
 .../{arch => extensions}/sync_examples.sh          |   0
 antora/components/rg/modules/ant/pages/Inject.adoc |   2 +-
 .../rg/modules/ant/pages/MemberOrder.adoc          |  13 +--
 .../ant/pages/MemberOrder}/_attributes.adoc        |   0
 .../modules/ant/pages/MemberOrder/name.adoc}       |   6 +-
 .../modules/ant/pages/MemberOrder/sequence.adoc}   |   5 +-
 .../modules/cfg/pages/specifying-components.adoc   |   2 +-
 .../pages/classes/AppManifest-bootstrapping.adoc   |   4 +-
 .../cms/pages/methods/prefixes/choices.adoc        |   2 +-
 .../cms/pages/methods/prefixes/default.adoc        |   2 +-
 .../cms/pages/methods/prefixes/disable.adoc        |   4 +-
 antora/components/rg/modules/mvn/pages/intro.adoc  |   4 +-
 .../components/rg/modules/mvn/pages/validate.adoc  |   2 +-
 .../svc/pages/integration-api/EmailService.adoc    |   2 +-
 .../persistence-layer-api/IsisJdoSupport.adoc      |  14 ++-
 .../UserRegistrationService.adoc                   |  25 +++--
 .../FixtureScriptsSpecificationProvider.adoc       |   2 +-
 .../modules/cgcom/pages/verifying-releases.adoc    |   2 +-
 .../pages/hints-and-tips/datanucleus-enhancer.adoc |   4 +-
 .../dg/pages/hints-and-tips/enabling-logging.adoc  |   2 +-
 .../how-run-fixtures-on-app-startup.adoc           |   2 +-
 .../support/modules/dg/pages/ide/eclipse.adoc      |   4 +-
 antora/components/toc/modules/ROOT/nav.adoc        |   4 +-
 .../components/toc/modules/ROOT/pages/about.adoc   |  41 +++++---
 .../ROOT/pages/more-thanks/more-thanks.adoc        |   2 +-
 .../what-is-apache-isis/common-use-cases.adoc      |   2 +-
 .../what-is-apache-isis/screencasts-older.adoc     |   4 +-
 .../pages/what-is-apache-isis/screencasts.adoc     |   2 +-
 .../toc/modules/module-template/pages/about.adoc   |   3 +-
 .../deployment/externalized-configuration.adoc     |   2 +-
 .../ug/modules/btb/pages/deployment/neo4j.adoc     |   4 +-
 antora/components/ug/modules/btb/pages/i18n.adoc   |   4 +-
 .../components/ug/modules/btb/pages/web-xml.adoc   |   2 +-
 antora/components/ug/modules/fun/pages/about.adoc  |   2 +-
 .../core-concepts/philosophy/how-eases-ddd.adoc    |   3 +-
 .../fun/pages/programming-model/mixins.adoc        |   2 +-
 .../fun/pages/programming-model/properties.adoc    |   2 +-
 .../programming-model/view-models/non-jaxb.adoc    |   4 +-
 .../pages/ui-hints/object-titles-and-icons.adoc    |   2 +-
 .../disabling-persistence-by-reachability.adoc     |   2 +-
 .../odn/pages/configuring/persistence-xml.adoc     |   2 +-
 antora/components/ug/modules/sec/pages/about.adoc  |   2 +-
 .../sec/pages/configuring-isis-to-use-shiro.adoc   |   4 +-
 .../shiro-realm-implementations/ini-realm.adoc     |   2 +-
 .../modules/sec/pages/usage-by-isis-viewers.adoc   |   6 +-
 .../bdd-spec-support/maven-configuration.adoc      |   2 +-
 .../pages/bdd-spec-support/writing-a-bdd-spec.adoc |   4 +-
 .../tst/pages/fixture-scripts/api-and-usage.adoc   |  10 +-
 .../pages/integ-test-support/bootstrapping.adoc    |   2 +-
 .../integ-test-support/maven-configuration.adoc    |   6 +-
 .../unit-test-support/maven-configuration.adoc     |   6 +-
 .../ug/modules/vro/pages/health-check.adoc         |   2 +-
 .../ug/modules/vro/pages/layout-resources.adoc     |   4 +-
 .../modules/vw/pages/configuration-properties.adoc |  52 ++++------
 .../ug/modules/vw/pages/customisation.adoc         |   1 +
 .../vw/pages/customisation/auto-refresh.adoc       |  11 +--
 .../vw/pages/customisation/custom-javascript.adoc  |  18 ++--
 .../pages/customisation/top-level-index-page.adoc  |   2 +-
 .../components/ug/modules/vw/pages/extending.adoc  |  17 ++--
 .../vw/pages/extending/custom-bootstrap-theme.adoc |   7 +-
 .../vw/pages/features/blob-attachments.adoc        |   5 +-
 .../vw/pages/features/bookmarked-pages.adoc        |   6 +-
 .../vw/pages/features/hints-and-copy-url.adoc      |   9 +-
 .../ug/modules/vw/pages/features/recent-pages.adoc |   4 +-
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |   2 +-
 .../vw/pages/features/titles-in-tables.adoc        |  15 +--
 .../vw/pages/features/user-registration.adoc       |  12 +--
 .../modules/vw/pages/layout/annotation-based.adoc  |  45 +++++----
 .../ug/modules/vw/pages/layout/file-based.adoc     |   4 +-
 antora/theme/ui-bundle.zip                         | Bin 269690 -> 269845 bytes
 .../src/main/resources/isis-version.properties     |   2 +-
 examples/apps/helloworld/_adoc/antora.yml          |   6 ++
 .../apps/helloworld/_adoc}/examples.csv            |   0
 .../_adoc/modules/ROOT}/_attributes.adoc           |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../_adoc/modules/ROOT/assets/images}/.gitkeep     |   0
 .../assets/images/helloworld-before-launch.png     | Bin
 .../modules/ROOT}/assets/images/helloworld.png     | Bin
 .../images/using-hello-world/010-root-page.png     | Bin
 .../020-login-to-wicket-viewer.png                 | Bin
 .../images/using-hello-world/030-home-page.png     | Bin
 .../040-create-object-from-menu.png                | Bin
 .../050-create-object-from-menu-prompt.png         | Bin
 .../using-hello-world/060-created-object.png       | Bin
 .../images/using-hello-world/070-update-name.png   | Bin
 .../images/using-hello-world/080-edit-notes.png    | Bin
 .../images/using-hello-world/090-delete-object.png | Bin
 .../using-hello-world/100-object-deleted.png       | Bin
 .../200-swagger-ui-before-reload.png               | Bin
 .../using-hello-world/210-helloworld-resources.png | Bin
 .../220-create-object-thru-rest-api.png            | Bin
 .../230-create-object-thru-rest-api-response.png   | Bin
 .../240-retrieve-object-using-rest-api.png         | Bin
 ...250-retrieve-object-using-rest-api-response.png | Bin
 .../_adoc/modules/ROOT}/examples/.gitkeep          |   0
 .../apps/helloworld/_adoc/modules/ROOT}/nav.adoc   |   0
 .../_adoc/modules/ROOT}/pages/_attributes.adoc     |   0
 .../modules/ROOT}/pages/_partials/_attributes.adoc |   0
 .../_adoc/modules/ROOT}/pages/about.adoc           |  23 ++++-
 .../apps/helloworld/_adoc}/sync_examples.sh        |   0
 examples/apps/helloworld/pom.xml                   |   8 +-
 examples/apps/simpleapp/_adoc/antora.yml           |   6 ++
 .../apps/simpleapp/_adoc}/examples.csv             |   0
 .../simpleapp/_adoc/modules/ROOT}/_attributes.adoc |   0
 .../modules/ROOT}/assets/images/dockerhub-tags.png | Bin
 .../images/simpleapp-webapp-before-launch.png      | Bin
 .../images/simpleapp-webapp-with-fixtures.png      | Bin
 .../ROOT}/assets/images/simpleapp-webapp.png       | Bin
 .../images/using-simple-app/030-home-page.png      | Bin
 .../040-run-fixture-script-menu.png                | Bin
 .../050-run-fixture-script-prompt.png              | Bin
 .../060-run-fixture-script-result.png              | Bin
 .../images/using-simple-app/070-home-page.png      | Bin
 .../using-simple-app/structure/structure.pptx      | Bin
 .../structure/structure/Slide1.PNG                 | Bin
 .../structure/structure/Slide2.PNG                 | Bin
 .../apps/simpleapp/_adoc/modules/ROOT}/nav.adoc    |   0
 .../_adoc/modules/ROOT}/pages/_attributes.adoc     |   0
 .../modules/ROOT}/pages/_partials/_attributes.adoc |   0
 .../simpleapp/_adoc/modules/ROOT}/pages/about.adoc |  25 ++++-
 .../apps/simpleapp/_adoc}/sync_examples.sh         |   0
 .../bdd/specs/SimpleObjectsStepDef.java            |   4 +-
 .../integtests/SimpleModuleIntegTestAbstract.java  |   7 +-
 .../integtests/tests/SimpleObject_IntegTest.java   |   2 +-
 .../integtests/tests/SimpleObjects_IntegTest.java  |   4 +-
 examples/apps/simpleapp/webapp/pom.xml             |  11 +++
 .../main/java/domainapp/application/SimpleApp.java |   1 -
 .../JdoBootstrappingTest_usingFixtures.java        | 106 +++++++++++++++++++++
 ...> IsisIntegrationTestAbstractWithFixtures.java} |  15 +--
 .../fixtures/fixturescripts/FixtureScripts.java    |  40 +++++---
 pom.xml                                            |  33 ++-----
 preview.sh                                         |   2 +-
 site.yml                                           |  10 +-
 193 files changed, 522 insertions(+), 345 deletions(-)