You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/17 22:57:54 UTC
[isis] branch v2-antora updated (afc9041 -> dbbf367)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git.
from afc9041 ISIS-2062: moves helloworld and simpleapp into its own Antora cpt.
add a25d035 Merge pull request #140 from apache/v2-antora
add 4df223b ISIS-2158 adding some missing java-doc to 'commons'
add 3d26dbc Updating the way title is shown in CONTRIBUTING.adoc
add c9b5591 Merge pull request #139 from kshithijiyer/patch-1
add 72e9b3e Merge remote-tracking branch 'origin/master' into v2
add 08a2207 ISIS-2158 remove renamed directory
add e4ffe64 ISIS-2158 fixes links to sources for the demo-app
add 3d5e624 ISIS-2158 fixes simple-app launching
add 37f18f8 ISIS-2158 introduces 2 prototypes sub-classing BuilderScriptAbstract
add 08ae903 ISIS-2158 simplifies SvenApplicationUser persona
add 61d812d ISIS-2158 re-enables simple-app's demo FixtureScript
add 5feca0c ISIS-2158 remove debug code
add 16827e5 ISIS-2158 simple web.xml for simple-app & demo
add b98ddd0 ISIS-2158 fixes simple-app`s 'Smoke_IntegTest'
add 786839f ISIS-2158: simplify application configuration
add 9bd86bc ISIS-2158 re-enables/fixes the metamodel tests for 'simpleapp'
add 6597326 ISIS-2158 showcase the DomainModel validation with 'simpleapp'
new 0641e23 ISIS-2062: moves demo docs to demo source code.
new 1b5aa19 ISIS-2062: converts extensions/asciidoc module into ext-asciidoc/ROOT component
new 7639c7b ISIS-2062: moves extensions/mardkwon module to ext-markdown/ROOT component
new 70ff728 ISIS-2062: moves extensions/fixtures module to ext-markdown/ROOT component
new f4e0f48 ISIS-2062: moves extensions/secman module to ext-secman/ROOT component
new 0e713b4 renames extensions/viewer-wicket-excel module to ext-viewer-wicket-excel component
new dbbf367 ISIS-2062: moves extensions docs alongside their code.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CONTRIBUTING.adoc | 4 +-
.../demoapp/modules/ROOT/_attributes.adoc | 6 -
.../demoapp/modules/ROOT/pages/_attributes.adoc | 4 -
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 -
antora/components/extensions/antora.yml | 12 -
.../extensions/modules/ROOT/pages/about.adoc | 3 -
.../extensions/modules/asciidoc/nav.adoc | 2 -
.../extensions/modules/fixtures/nav.adoc | 2 -
.../extensions/modules/markdown/nav.adoc | 2 -
.../components/extensions/modules/secman/nav.adoc | 2 -
.../extensions/modules/specsupport/nav.adoc | 2 -
.../modules/viewer-wicket-excel/nav.adoc | 2 -
.../modules/viewer-wicket-excel/pages/about.adoc | 6 -
antora/components/rg/antora.yml | 2 +-
.../components/toc/modules/ROOT/pages/about.adoc | 10 +-
antora/components/ug/antora.yml | 2 +-
.../vw/pages/features/user-registration.adoc | 2 +-
antora/theme/ui-bundle.zip | Bin 269845 -> 276988 bytes
.../applib/services/wrapper/WrapperFactory.java | 4 +-
.../org/apache/isis/commons/collections/Bin.java | 126 ++-
.../isis/commons/collections/Cardinality.java | 11 +
.../isis/commons/internal/base/_NullSafe.java | 7 +-
.../isis/commons/internal/collections/_Arrays.java | 8 +
.../commons/internal/exceptions/_Exceptions.java | 7 +
.../validate/ValidateDomainModel.java | 77 ++
.../org/apache/isis/mavenplugin/util/Log4j.java | 55 -
.../metamodel/MetaModelContext_usingSpring.java | 1 +
.../apps/demo/_adoc}/antora.yml | 2 +-
.../apps/demo/_adoc}/examples.csv | 0
.../apps/demo/_adoc/modules/ROOT}/_attributes.adoc | 0
.../apps/demo/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../apps/demo/_adoc}/modules/ROOT/pages/about.adoc | 0
.../apps/demo/_adoc}/sync_examples.sh | 0
.../src/main/java/domainapp/utils/DemoStub.java | 2 +-
examples/apps/demo/src/main/webapp/WEB-INF/web.xml | 29 +-
examples/apps/helloworld/_adoc/antora.yml | 2 +-
examples/apps/simpleapp/_adoc/antora.yml | 2 +-
.../application/logging-integtest.properties | 121 ---
.../fixture/scenarios/DomainAppDemo.java | 14 +-
.../SimpleAppConfiguration.java} | 17 +-
.../conf/SimpleAppConfigurationForTesting.java} | 26 +-
.../manifest => conf}/isis-non-changing.properties | 0
.../manifest => conf}/menubars.layout.xml | 0
.../bdd/specs/SimpleObjectsStepDef.java | 5 +-
.../integtests/SpringIntegrationTest.java | 8 +-
.../integtests/mml/DomainModel_IntegTest.java} | 18 +-
.../integtests/mml/MetaModelService_IntegTest.java | 12 +-
...omainAppFixtureScriptsSpecificationProvider.xml | 34 +-
...application.fixture.scenarios.DomainAppDemo.xml | 568 +++++++++--
...tion.services.health.HealthCheckServiceImpl.xml | 34 +-
...plication.services.homepage.HomePageService.xml | 90 +-
...ication.services.homepage.HomePageViewModel.xml | 541 +++++++---
...dules.simple.SimpleModule$ActionDomainEvent.xml | 1069 ++++++++++++++++++++
...s.simple.SimpleModule$CollectionDomainEvent.xml | 842 +++++++++++++++
...les.simple.SimpleModule$PropertyDomainEvent.xml | 834 +++++++++++++++
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 963 ++++++++++++------
...le.dom.impl.SimpleObjects$CreateDomainEvent.xml | 1069 ++++++++++++++++++++
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 248 +++--
....modules.simple.fixture.SimpleObjectBuilder.xml | 750 ++++++++++++++
...modules.simple.fixture.SimpleObject_persona.xml | 63 ++
.../integtests/smoke/Smoke_IntegTest.java | 12 +-
.../domainapp/modules/simple/SimpleModule.java | 17 +-
.../simple/fixture/SimpleObjectBuilder.java | 17 +-
.../main/java/domainapp/application/SimpleApp.java | 9 +-
.../main/{webapp/WEB-INF => resources}/shiro.ini | 0
.../src/main/webapp/WEB-INF/logging.properties | 246 -----
.../webapp/src/main/webapp/WEB-INF/web.xml | 22 +-
.../JdoBootstrappingTest_usingFixtures.java | 106 --
.../Configuration_usingJdo.java} | 12 +-
.../Configuration_usingJdoAndShiro.java} | 14 +-
.../isis/testdomain/jdo/JdoTestDomainModule.java | 54 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 43 +-
.../testdomain/auditing/AuditerServiceTest.java | 25 +-
.../bootstrapping/JdoBootstrappingTest.java | 10 +-
.../JdoBootstrappingTest_usingFixtures.java | 10 +-
.../SpringServiceProvisioningTest.java | 12 +-
.../commandexecution/BackgroundExecutionTest.java | 10 +-
.../testdomain/commandexecution/WrapperTest.java | 4 +-
.../eventhandling/SpringEventPublishingTest.java | 4 +-
.../testdomain/ldap/LdapEmbeddedServerTest.java | 6 +-
.../publishing/PublisherServiceTest.java | 24 +-
.../isis/testdomain/rest/RestServiceTest.java | 14 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 15 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 18 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 17 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 15 +-
.../isis/testdomain/shiro/ShiroSimpleTest.java | 8 +-
.../transactions/TransactionRollbackTest.java | 10 +-
.../TransactionRollbackTest_withTransactional.java | 8 +-
.../asciidoc/_adoc}/antora.yml | 4 +-
.../asciidoc/_adoc}/examples.csv | 0
.../asciidoc/_adoc/modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../asciidoc/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../asciidoc/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../asciidoc/_adoc/modules/ROOT}/pages/about.adoc | 0
.../asciidoc/_adoc}/sync_examples.sh | 0
.../fixtures/_adoc}/antora.yml | 4 +-
.../fixtures}/_adoc/examples.csv | 0
.../fixtures/_adoc/modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../fixtures/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../fixtures/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../fixtures/_adoc/modules/ROOT}/pages/about.adoc | 0
.../fixtures}/_adoc/sync_examples.sh | 0
.../fixturescripts/BuilderScriptAbstract.java | 51 +-
.../fixturescripts/BuilderScriptWithResult.java} | 29 +-
.../fixturescripts/BuilderScriptWithoutResult.java | 15 +-
.../fixtures/fixturescripts/FixtureScripts.java | 22 +-
.../fixturespec/FixtureScriptsDefault.java | 6 +-
.../markdown/_adoc}/antora.yml | 4 +-
.../markdown}/_adoc/examples.csv | 0
.../markdown/_adoc/modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../markdown/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../markdown/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../markdown/_adoc/modules/ROOT}/pages/about.adoc | 0
.../markdown}/_adoc/sync_examples.sh | 0
.../demoapp => extensions/secman/_adoc}/antora.yml | 4 +-
.../secman}/_adoc/examples.csv | 0
.../secman/_adoc/modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../secman/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../secman/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../secman/_adoc/modules/ROOT}/pages/about.adoc | 0
.../secman}/_adoc/sync_examples.sh | 0
.../specsupport/_adoc}/antora.yml | 4 +-
.../specsupport}/_adoc/examples.csv | 0
.../_adoc/modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../_adoc/modules/ROOT/examples}/.gitkeep | 0
.../specsupport/_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 | 0
.../specsupport}/_adoc/sync_examples.sh | 0
extensions/viewer-wicket-excel/_adoc/antora.yml | 6 +
.../viewer-wicket-excel}/_adoc/examples.csv | 0
.../_adoc}/modules/ROOT/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT}/assets/images/.gitkeep | 0
.../_adoc/modules/ROOT/examples}/.gitkeep | 0
.../_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 | 4 +-
.../viewer-wicket-excel}/_adoc/sync_examples.sh | 0
site.yml | 19 +-
163 files changed, 6974 insertions(+), 1686 deletions(-)
delete mode 100644 antora/components/demoapp/modules/ROOT/_attributes.adoc
delete mode 100644 antora/components/demoapp/modules/ROOT/pages/_attributes.adoc
delete mode 100644 antora/components/demoapp/modules/ROOT/pages/_partials/_attributes.adoc
delete mode 100644 antora/components/extensions/antora.yml
delete mode 100644 antora/components/extensions/modules/ROOT/pages/about.adoc
delete mode 100644 antora/components/extensions/modules/asciidoc/nav.adoc
delete mode 100644 antora/components/extensions/modules/fixtures/nav.adoc
delete mode 100644 antora/components/extensions/modules/markdown/nav.adoc
delete mode 100644 antora/components/extensions/modules/secman/nav.adoc
delete mode 100644 antora/components/extensions/modules/specsupport/nav.adoc
delete mode 100644 antora/components/extensions/modules/viewer-wicket-excel/nav.adoc
delete mode 100644 antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc
create mode 100644 core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
delete mode 100644 core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/util/Log4j.java
copy {antora/components/demoapp => examples/apps/demo/_adoc}/antora.yml (75%)
rename {antora/components/extensions => examples/apps/demo/_adoc}/examples.csv (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel => examples/apps/demo/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions => examples/apps/demo/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel => examples/apps/demo/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel => examples/apps/demo/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/demoapp => examples/apps/demo/_adoc}/modules/ROOT/pages/about.adoc (100%)
rename {antora/components/extensions => examples/apps/demo/_adoc}/sync_examples.sh (100%)
delete mode 100644 examples/apps/simpleapp/application/logging-integtest.properties
rename examples/apps/simpleapp/application/src/main/java/domainapp/{application/manifest/SimpleAppManifest.java => conf/SimpleAppConfiguration.java} (87%)
copy examples/apps/simpleapp/{module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java => application/src/main/java/domainapp/conf/SimpleAppConfigurationForTesting.java} (74%)
rename examples/apps/simpleapp/application/src/main/java/domainapp/{application/manifest => conf}/isis-non-changing.properties (100%)
rename examples/apps/simpleapp/application/src/main/java/domainapp/{application/manifest => conf}/menubars.layout.xml (100%)
copy examples/{misc/metamodel/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java => apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java} (70%)
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.SimpleModule$ActionDomainEvent.xml
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.SimpleModule$CollectionDomainEvent.xml
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.SimpleModule$PropertyDomainEvent.xml
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects$CreateDomainEvent.xml
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.fixture.SimpleObjectBuilder.xml
create mode 100644 examples/apps/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.fixture.SimpleObject_persona.xml
rename examples/apps/simpleapp/webapp/src/main/{webapp/WEB-INF => resources}/shiro.ini (100%)
delete mode 100644 examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
delete mode 100644 examples/smoketest/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
copy examples/smoketests/src/main/java/org/apache/isis/testdomain/{jdo/JdoTestDomainModule.java => conf/Configuration_usingJdo.java} (87%)
rename examples/smoketests/src/main/java/org/apache/isis/testdomain/{jdo/JdoTestDomainModule_withShiro.java => conf/Configuration_usingJdoAndShiro.java} (87%)
copy {antora/components/demoapp => extensions/asciidoc/_adoc}/antora.yml (59%)
rename {antora/components/demoapp => extensions/asciidoc/_adoc}/examples.csv (100%)
rename {antora/components/extensions/modules/specsupport => extensions/asciidoc/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel/examples => extensions/asciidoc/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel => extensions/asciidoc/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/viewer-wicket-excel/assets/attachments => extensions/asciidoc/_adoc/modules/ROOT/examples}/.gitkeep (100%)
rename {antora/components/demoapp => extensions/asciidoc/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/specsupport => extensions/asciidoc/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/specsupport => extensions/asciidoc/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/extensions/modules/asciidoc => extensions/asciidoc/_adoc/modules/ROOT}/pages/about.adoc (100%)
rename {antora/components/demoapp => extensions/asciidoc/_adoc}/sync_examples.sh (100%)
copy {antora/components/demoapp => extensions/fixtures/_adoc}/antora.yml (59%)
copy {examples/apps/simpleapp => extensions/fixtures}/_adoc/examples.csv (100%)
rename {antora/components/extensions/modules/secman => extensions/fixtures/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions/modules/specsupport/examples => extensions/fixtures/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/specsupport => extensions/fixtures/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/specsupport/assets/attachments => extensions/fixtures/_adoc/modules/ROOT/examples}/.gitkeep (100%)
copy {antora/components/ug => extensions/fixtures/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/secman => extensions/fixtures/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/secman => extensions/fixtures/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/extensions/modules/fixtures => extensions/fixtures/_adoc/modules/ROOT}/pages/about.adoc (100%)
copy {examples/apps/simpleapp => extensions/fixtures}/_adoc/sync_examples.sh (100%)
copy extensions/{secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java => fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java} (66%)
copy core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionPlaceholder.java => extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java (79%)
copy {antora/components/demoapp => extensions/markdown/_adoc}/antora.yml (59%)
copy {examples/apps/simpleapp => extensions/markdown}/_adoc/examples.csv (100%)
rename {antora/components/extensions/modules/markdown => extensions/markdown/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions/modules/secman/examples => extensions/markdown/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/secman => extensions/markdown/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/secman/assets/attachments => extensions/markdown/_adoc/modules/ROOT/examples}/.gitkeep (100%)
copy {antora/components/ug => extensions/markdown/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/markdown => extensions/markdown/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/markdown => extensions/markdown/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/extensions/modules/markdown => extensions/markdown/_adoc/modules/ROOT}/pages/about.adoc (100%)
copy {examples/apps/simpleapp => extensions/markdown}/_adoc/sync_examples.sh (100%)
copy {antora/components/demoapp => extensions/secman/_adoc}/antora.yml (61%)
copy {examples/apps/simpleapp => extensions/secman}/_adoc/examples.csv (100%)
rename {antora/components/extensions/modules/fixtures => extensions/secman/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions/modules/markdown/examples => extensions/secman/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/markdown => extensions/secman/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/markdown/assets/attachments => extensions/secman/_adoc/modules/ROOT/examples}/.gitkeep (100%)
copy {antora/components/ug => extensions/secman/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/fixtures => extensions/secman/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/fixtures => extensions/secman/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/extensions/modules/secman => extensions/secman/_adoc/modules/ROOT}/pages/about.adoc (100%)
copy {examples/apps/simpleapp => extensions/secman}/_adoc/sync_examples.sh (100%)
rename {antora/components/demoapp => extensions/specsupport/_adoc}/antora.yml (53%)
copy {examples/apps/simpleapp => extensions/specsupport}/_adoc/examples.csv (100%)
rename {antora/components/extensions/modules/asciidoc => extensions/specsupport/_adoc/modules/ROOT}/_attributes.adoc (100%)
rename {antora/components/extensions/modules/fixtures/examples => extensions/specsupport/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/fixtures => extensions/specsupport/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/fixtures/assets/attachments => extensions/specsupport/_adoc/modules/ROOT/examples}/.gitkeep (100%)
copy {antora/components/ug => extensions/specsupport/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions/modules/asciidoc => extensions/specsupport/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
rename {antora/components/extensions/modules/asciidoc => extensions/specsupport/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
rename {antora/components/extensions/modules/specsupport => extensions/specsupport/_adoc/modules/ROOT}/pages/about.adoc (100%)
copy {examples/apps/simpleapp => extensions/specsupport}/_adoc/sync_examples.sh (100%)
create mode 100644 extensions/viewer-wicket-excel/_adoc/antora.yml
copy {examples/apps/simpleapp => extensions/viewer-wicket-excel}/_adoc/examples.csv (100%)
rename {antora/components/extensions => extensions/viewer-wicket-excel/_adoc}/modules/ROOT/_attributes.adoc (100%)
rename {antora/components/extensions/modules/asciidoc/examples => extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
rename {antora/components/extensions/modules/asciidoc => extensions/viewer-wicket-excel/_adoc/modules/ROOT}/assets/images/.gitkeep (100%)
rename {antora/components/extensions/modules/asciidoc/assets/attachments => extensions/viewer-wicket-excel/_adoc/modules/ROOT/examples}/.gitkeep (100%)
copy {antora/components/ug => extensions/viewer-wicket-excel/_adoc}/modules/ROOT/nav.adoc (100%)
rename {antora/components/extensions => extensions/viewer-wicket-excel/_adoc}/modules/ROOT/pages/_attributes.adoc (100%)
rename {antora/components/extensions => extensions/viewer-wicket-excel/_adoc}/modules/ROOT/pages/_partials/_attributes.adoc (100%)
copy antora/components/rg/modules/cms/pages/classes/value-types/Money.adoc => extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/about.adoc (91%)
copy {examples/apps/simpleapp => extensions/viewer-wicket-excel}/_adoc/sync_examples.sh (100%)
[isis] 02/07: ISIS-2062: converts extensions/asciidoc module into
ext-asciidoc/ROOT component
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b5aa198d42e578aaac790a5f27913819f3e4496
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:21:21 2019 +0100
ISIS-2062: converts extensions/asciidoc module into ext-asciidoc/ROOT component
---
antora/components/ext-asciidoc/antora.yml | 6 ++++
antora/components/ext-asciidoc/examples.csv | 1 +
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../components/ext-asciidoc/modules/ROOT/nav.adoc | 2 ++
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
antora/components/ext-asciidoc/sync_examples.sh | 39 ++++++++++++++++++++++
antora/components/extensions/antora.yml | 1 -
.../extensions/modules/asciidoc/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 2 +-
site.yml | 3 ++
15 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/antora/components/ext-asciidoc/antora.yml b/antora/components/ext-asciidoc/antora.yml
new file mode 100644
index 0000000..852d599
--- /dev/null
+++ b/antora/components/ext-asciidoc/antora.yml
@@ -0,0 +1,6 @@
+name: ext-asciidoc
+title: "Extensions - Asciidoc"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/ext-asciidoc/examples.csv b/antora/components/ext-asciidoc/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/antora/components/ext-asciidoc/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/antora/components/extensions/modules/asciidoc/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/examples/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/examples/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/asciidoc/assets/images/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/assets/images/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/asciidoc/assets/attachments/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/assets/attachments/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-asciidoc/modules/ROOT/nav.adoc b/antora/components/ext-asciidoc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/antora/components/ext-asciidoc/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/antora/components/extensions/modules/asciidoc/pages/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/pages/_partials/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/_partials/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/pages/about.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/about.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-asciidoc/sync_examples.sh b/antora/components/ext-asciidoc/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/antora/components/ext-asciidoc/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index 46631e3..2e80ed4 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -8,5 +8,4 @@ nav:
- modules/specsupport/nav.adoc
- modules/secman/nav.adoc
- modules/viewer-wicket-excel/nav.adoc
-- modules/asciidoc/nav.adoc
- modules/markdown/nav.adoc
diff --git a/antora/components/extensions/modules/asciidoc/nav.adoc b/antora/components/extensions/modules/asciidoc/nav.adoc
deleted file mode 100644
index f0240e0..0000000
--- a/antora/components/extensions/modules/asciidoc/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Asciidoc]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 1d553ce..1bebc4f 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -66,7 +66,7 @@ include::_attributes.adoc[]
** xref:ext:secman:about.adoc[Security Manager]
** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
* Values Types
-** xref:ext:asciidoc:about.adoc[Asciidoc], xref:ext:markdown:about.adoc[Markdown]
+** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext:markdown:about.adoc[Markdown]
|*Get involved*
diff --git a/site.yml b/site.yml
index 024ce3f..7b27e7e 100644
--- a/site.yml
+++ b/site.yml
@@ -22,6 +22,9 @@ content:
start_path: antora/components/extensions
- url: .
branches: HEAD
+ start_path: antora/components/ext-asciidoc
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD
[isis] 05/07: ISIS-2062: moves extensions/secman module to
ext-secman/ROOT component
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f4e0f48a1fe196ae953d1d1a0743c97c0aaa7764
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:28:37 2019 +0100
ISIS-2062: moves extensions/secman module to ext-secman/ROOT component
---
antora/components/ext-secman/antora.yml | 6 ++++
antora/components/ext-secman/examples.csv | 1 +
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
antora/components/ext-secman/modules/ROOT/nav.adoc | 2 ++
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
antora/components/ext-secman/sync_examples.sh | 39 ++++++++++++++++++++++
antora/components/extensions/antora.yml | 1 -
.../components/extensions/modules/secman/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 2 +-
.../vw/pages/features/user-registration.adoc | 2 +-
site.yml | 6 ++++
16 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/antora/components/ext-secman/antora.yml b/antora/components/ext-secman/antora.yml
new file mode 100644
index 0000000..e9f2417
--- /dev/null
+++ b/antora/components/ext-secman/antora.yml
@@ -0,0 +1,6 @@
+name: ext-secman
+title: "Extensions - SecMan"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/ext-secman/examples.csv b/antora/components/ext-secman/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/antora/components/ext-secman/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/antora/components/extensions/modules/secman/_attributes.adoc b/antora/components/ext-secman/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/secman/_attributes.adoc
rename to antora/components/ext-secman/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/secman/examples/.gitkeep b/antora/components/ext-secman/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/secman/examples/.gitkeep
rename to antora/components/ext-secman/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/secman/assets/images/.gitkeep b/antora/components/ext-secman/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/secman/assets/images/.gitkeep
rename to antora/components/ext-secman/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/secman/assets/attachments/.gitkeep b/antora/components/ext-secman/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/secman/assets/attachments/.gitkeep
rename to antora/components/ext-secman/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-secman/modules/ROOT/nav.adoc b/antora/components/ext-secman/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/antora/components/ext-secman/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/antora/components/extensions/modules/secman/pages/_attributes.adoc b/antora/components/ext-secman/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/secman/pages/_attributes.adoc
rename to antora/components/ext-secman/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/secman/pages/_partials/_attributes.adoc b/antora/components/ext-secman/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/secman/pages/_partials/_attributes.adoc
rename to antora/components/ext-secman/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/secman/pages/about.adoc b/antora/components/ext-secman/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/secman/pages/about.adoc
rename to antora/components/ext-secman/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-secman/sync_examples.sh b/antora/components/ext-secman/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/antora/components/ext-secman/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index 12549bd..0a2127a 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -5,5 +5,4 @@ start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
- modules/specsupport/nav.adoc
-- modules/secman/nav.adoc
- modules/viewer-wicket-excel/nav.adoc
diff --git a/antora/components/extensions/modules/secman/nav.adoc b/antora/components/extensions/modules/secman/nav.adoc
deleted file mode 100644
index ff22afc..0000000
--- a/antora/components/extensions/modules/secman/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Security Manager]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index cb4d334..b769382 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -63,7 +63,7 @@ include::_attributes.adoc[]
** xref:ext-fixtures:ROOT:about.adoc[Fixtures]
** xref:ext:specsupport:about.adoc[(BDD) Spec Support]
* Modules
-** xref:ext:secman:about.adoc[Security Manager]
+** xref:ext-secman:ROOT:about.adoc[Security Manager]
** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
* Values Types
** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext-markdown:ROOT:about.adoc[Markdown]
diff --git a/antora/components/ug/modules/vw/pages/features/user-registration.adoc b/antora/components/ug/modules/vw/pages/features/user-registration.adoc
index c079cd0..bee520d 100644
--- a/antora/components/ug/modules/vw/pages/features/user-registration.adoc
+++ b/antora/components/ug/modules/vw/pages/features/user-registration.adoc
@@ -20,7 +20,7 @@ To support this the framework requires three services to be registered and confi
* the xref:rg:svc:integration-api/EmailService.adoc[email service], that is used by the email notification service to actually send the email.
The Apache Isis core framework provides a default implementation of both the email notification service and the email service.
-The xref:ext:secman:about.adoc[Security Manager] extension provides a partial implementation of xref:rg:svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
+The xref:ext-secman:ROOT:about.adoc[Security Manager] extension provides a partial implementation of xref:rg:svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
// TODO: v2: search for references of 'security module' because this is now available as the 'secman' extension, and reference the extensions doc component.
diff --git a/site.yml b/site.yml
index 15a61ee..6efd4d2 100644
--- a/site.yml
+++ b/site.yml
@@ -28,6 +28,12 @@ content:
start_path: antora/components/ext-markdown
- url: .
branches: HEAD
+ start_path: antora/components/ext-fixtures
+ - url: .
+ branches: HEAD
+ start_path: antora/components/ext-secman
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD
[isis] 06/07: renames extensions/viewer-wicket-excel module to
ext-viewer-wicket-excel component
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0e713b47673e1a452b39bfb6ed53cb0d4a436b1f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 00:52:46 2019 +0200
renames extensions/viewer-wicket-excel module to ext-viewer-wicket-excel component
Also updates the ui theme.
---
antora/components/ext-specsupport/antora.yml | 6 ++++++
.../{extensions => ext-specsupport}/examples.csv | 0
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../modules/ROOT/nav.adoc | 0
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
.../sync_examples.sh | 0
.../components/ext-viewer-wicket-excel/antora.yml | 6 ++++++
.../examples.csv | 0
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../modules/ROOT/nav.adoc | 0
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 4 ++--
.../sync_examples.sh | 0
antora/components/extensions/antora.yml | 8 --------
.../extensions/modules/ROOT/_attributes.adoc | 6 ------
.../extensions/modules/ROOT/pages/_attributes.adoc | 4 ----
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 ----
.../extensions/modules/ROOT/pages/about.adoc | 3 ---
.../extensions/modules/specsupport/nav.adoc | 2 --
.../modules/viewer-wicket-excel/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 4 ++--
antora/theme/ui-bundle.zip | Bin 269845 -> 276988 bytes
site.yml | 9 ++++++---
32 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/antora/components/ext-specsupport/antora.yml b/antora/components/ext-specsupport/antora.yml
new file mode 100644
index 0000000..5c7bc3b
--- /dev/null
+++ b/antora/components/ext-specsupport/antora.yml
@@ -0,0 +1,6 @@
+name: ext-specsupport
+title: "Extensions - (BDD) Spec Support"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/examples.csv b/antora/components/ext-specsupport/examples.csv
similarity index 100%
copy from antora/components/extensions/examples.csv
copy to antora/components/ext-specsupport/examples.csv
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/examples/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/examples/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/assets/images/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/assets/images/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/assets/attachments/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/assets/attachments/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/ext-specsupport/modules/ROOT/nav.adoc
similarity index 100%
copy from antora/components/extensions/modules/ROOT/nav.adoc
copy to antora/components/ext-specsupport/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/_partials/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/_partials/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/about.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/about.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/about.adoc
diff --git a/antora/components/extensions/sync_examples.sh b/antora/components/ext-specsupport/sync_examples.sh
similarity index 100%
copy from antora/components/extensions/sync_examples.sh
copy to antora/components/ext-specsupport/sync_examples.sh
diff --git a/antora/components/ext-viewer-wicket-excel/antora.yml b/antora/components/ext-viewer-wicket-excel/antora.yml
new file mode 100644
index 0000000..ebf6730
--- /dev/null
+++ b/antora/components/ext-viewer-wicket-excel/antora.yml
@@ -0,0 +1,6 @@
+name: ext-viewer-wicket-excel
+title: "Extensions: Excel Download (Wicket)"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/examples.csv b/antora/components/ext-viewer-wicket-excel/examples.csv
similarity index 100%
rename from antora/components/extensions/examples.csv
rename to antora/components/ext-viewer-wicket-excel/examples.csv
diff --git a/antora/components/extensions/modules/specsupport/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/examples/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/examples/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/specsupport/assets/images/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/assets/images/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/specsupport/assets/attachments/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/assets/attachments/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/nav.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/_partials/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/_partials/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
similarity index 88%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
index cd98d47..ea61261 100644
--- a/antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc
+++ b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
@@ -1,6 +1,6 @@
-= Wicket Excel Extension
+= About
:Notice: 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 ag [...]
include::_attributes.adoc[]
-TODO: v2: placeholder for documentation about extensions/viewer-wicket-excel
+TODO: v2: placeholder for documentation about ext-viewer-wicket-excel
diff --git a/antora/components/extensions/sync_examples.sh b/antora/components/ext-viewer-wicket-excel/sync_examples.sh
similarity index 100%
rename from antora/components/extensions/sync_examples.sh
rename to antora/components/ext-viewer-wicket-excel/sync_examples.sh
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
deleted file mode 100644
index 0a2127a..0000000
--- a/antora/components/extensions/antora.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: ext
-title: "Extensions"
-version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
-- modules/specsupport/nav.adoc
-- modules/viewer-wicket-excel/nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/_attributes.adoc b/antora/components/extensions/modules/ROOT/_attributes.adoc
deleted file mode 100644
index 787e5c4..0000000
--- a/antora/components/extensions/modules/ROOT/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/_attributes.adoc b/antora/components/extensions/modules/ROOT/pages/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/antora/components/extensions/modules/ROOT/pages/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/about.adoc b/antora/components/extensions/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 21c3a59..0000000
--- a/antora/components/extensions/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= About
-include::_attributes.adoc[]
-
diff --git a/antora/components/extensions/modules/specsupport/nav.adoc b/antora/components/extensions/modules/specsupport/nav.adoc
deleted file mode 100644
index 3fa15e7..0000000
--- a/antora/components/extensions/modules/specsupport/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[(BDD) Spec Support]
-
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc b/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc
deleted file mode 100644
index f20e860..0000000
--- a/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Excel Download (Wicket)]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index b769382..385993d 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -61,10 +61,10 @@ include::_attributes.adoc[]
* Testing & Prototyping
** xref:ext-fixtures:ROOT:about.adoc[Fixtures]
-** xref:ext:specsupport:about.adoc[(BDD) Spec Support]
+** xref:ext-specsupport:ROOT:about.adoc[(BDD) Spec Support]
* Modules
** xref:ext-secman:ROOT:about.adoc[Security Manager]
-** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
+** xref:ext-viewer-wicket-excel:ROOT:about.adoc[Excel Download (Wicket)]
* Values Types
** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext-markdown:ROOT:about.adoc[Markdown]
diff --git a/antora/theme/ui-bundle.zip b/antora/theme/ui-bundle.zip
index db7f537..76b6762 100644
Binary files a/antora/theme/ui-bundle.zip and b/antora/theme/ui-bundle.zip differ
diff --git a/site.yml b/site.yml
index 6efd4d2..fc0767f 100644
--- a/site.yml
+++ b/site.yml
@@ -19,9 +19,6 @@ content:
branches: HEAD
- url: .
branches: HEAD
- start_path: antora/components/extensions
- - url: .
- branches: HEAD
start_path: antora/components/ext-asciidoc
- url: .
branches: HEAD
@@ -34,6 +31,12 @@ content:
start_path: antora/components/ext-secman
- url: .
branches: HEAD
+ start_path: antora/components/ext-specsupport
+ - url: .
+ branches: HEAD
+ start_path: antora/components/ext-viewer-wicket-excel
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD
[isis] 07/07: ISIS-2062: moves extensions docs alongside their code.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dbbf367808910916597ea601a4ed79661a95d98a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 00:57:18 2019 +0200
ISIS-2062: moves extensions docs alongside their code.
---
.../ext-asciidoc => extensions/asciidoc/_adoc}/antora.yml | 0
.../asciidoc/_adoc}/examples.csv | 0
.../asciidoc/_adoc}/modules/ROOT/_attributes.adoc | 0
.../asciidoc/_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../asciidoc/_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../asciidoc/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../asciidoc/_adoc}/modules/ROOT/nav.adoc | 0
.../asciidoc/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../asciidoc/_adoc}/modules/ROOT/pages/about.adoc | 0
.../asciidoc/_adoc}/sync_examples.sh | 0
.../ext-fixtures => extensions/fixtures/_adoc}/antora.yml | 0
.../fixtures/_adoc}/examples.csv | 0
.../fixtures/_adoc}/modules/ROOT/_attributes.adoc | 0
.../fixtures/_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../fixtures/_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../fixtures/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../fixtures/_adoc}/modules/ROOT/nav.adoc | 0
.../fixtures/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../fixtures/_adoc}/modules/ROOT/pages/about.adoc | 0
.../fixtures/_adoc}/sync_examples.sh | 0
.../ext-markdown => extensions/markdown/_adoc}/antora.yml | 0
.../ext-secman => extensions/markdown/_adoc}/examples.csv | 0
.../markdown/_adoc}/modules/ROOT/_attributes.adoc | 0
.../markdown/_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../markdown/_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../markdown/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../markdown/_adoc}/modules/ROOT/nav.adoc | 0
.../markdown/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../markdown/_adoc}/modules/ROOT/pages/about.adoc | 0
.../markdown/_adoc}/sync_examples.sh | 0
.../ext-secman => extensions/secman/_adoc}/antora.yml | 0
.../ext-markdown => extensions/secman/_adoc}/examples.csv | 0
.../secman/_adoc}/modules/ROOT/_attributes.adoc | 0
.../secman/_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../secman/_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../secman/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../secman/_adoc}/modules/ROOT/nav.adoc | 0
.../secman/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../secman/_adoc}/modules/ROOT/pages/about.adoc | 0
.../secman/_adoc}/sync_examples.sh | 0
.../specsupport/_adoc}/antora.yml | 0
.../specsupport/_adoc}/examples.csv | 0
.../specsupport/_adoc}/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../specsupport/_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../specsupport/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../specsupport/_adoc}/modules/ROOT/nav.adoc | 0
.../specsupport/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../specsupport/_adoc}/modules/ROOT/pages/about.adoc | 0
.../specsupport/_adoc}/sync_examples.sh | 0
.../viewer-wicket-excel/_adoc}/antora.yml | 0
.../viewer-wicket-excel/_adoc}/examples.csv | 0
.../viewer-wicket-excel/_adoc}/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../_adoc}/modules/ROOT/assets/images/.gitkeep | 0
.../_adoc/modules/ROOT/examples}/.gitkeep | 0
.../viewer-wicket-excel/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../viewer-wicket-excel/_adoc}/modules/ROOT/pages/about.adoc | 0
.../viewer-wicket-excel/_adoc}/sync_examples.sh | 0
site.yml | 12 ++++++------
67 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/antora/components/ext-asciidoc/antora.yml b/extensions/asciidoc/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-asciidoc/antora.yml
rename to extensions/asciidoc/_adoc/antora.yml
diff --git a/antora/components/ext-viewer-wicket-excel/examples.csv b/extensions/asciidoc/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/examples.csv
rename to extensions/asciidoc/_adoc/examples.csv
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc
rename to extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc b/extensions/asciidoc/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc
rename to extensions/asciidoc/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc
rename to extensions/asciidoc/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc b/extensions/asciidoc/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc
rename to extensions/asciidoc/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-viewer-wicket-excel/sync_examples.sh b/extensions/asciidoc/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/sync_examples.sh
rename to extensions/asciidoc/_adoc/sync_examples.sh
diff --git a/antora/components/ext-fixtures/antora.yml b/extensions/fixtures/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-fixtures/antora.yml
rename to extensions/fixtures/_adoc/antora.yml
diff --git a/antora/components/ext-specsupport/examples.csv b/extensions/fixtures/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-specsupport/examples.csv
rename to extensions/fixtures/_adoc/examples.csv
diff --git a/antora/components/ext-specsupport/modules/ROOT/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-specsupport/modules/ROOT/nav.adoc b/extensions/fixtures/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/nav.adoc
rename to extensions/fixtures/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-fixtures/modules/ROOT/pages/about.adoc b/extensions/fixtures/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/pages/about.adoc
rename to extensions/fixtures/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-specsupport/sync_examples.sh b/extensions/fixtures/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-specsupport/sync_examples.sh
rename to extensions/fixtures/_adoc/sync_examples.sh
diff --git a/antora/components/ext-markdown/antora.yml b/extensions/markdown/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-markdown/antora.yml
rename to extensions/markdown/_adoc/antora.yml
diff --git a/antora/components/ext-secman/examples.csv b/extensions/markdown/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-secman/examples.csv
rename to extensions/markdown/_adoc/examples.csv
diff --git a/antora/components/ext-secman/modules/ROOT/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/_attributes.adoc
rename to extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-secman/modules/ROOT/examples/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/examples/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-secman/modules/ROOT/assets/images/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/assets/images/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-secman/modules/ROOT/assets/attachments/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-secman/modules/ROOT/nav.adoc b/extensions/markdown/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/nav.adoc
rename to extensions/markdown/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-secman/modules/ROOT/pages/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/pages/_attributes.adoc
rename to extensions/markdown/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-secman/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-markdown/modules/ROOT/pages/about.adoc b/extensions/markdown/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/pages/about.adoc
rename to extensions/markdown/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-secman/sync_examples.sh b/extensions/markdown/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-secman/sync_examples.sh
rename to extensions/markdown/_adoc/sync_examples.sh
diff --git a/antora/components/ext-secman/antora.yml b/extensions/secman/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-secman/antora.yml
rename to extensions/secman/_adoc/antora.yml
diff --git a/antora/components/ext-markdown/examples.csv b/extensions/secman/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-markdown/examples.csv
rename to extensions/secman/_adoc/examples.csv
diff --git a/antora/components/ext-markdown/modules/ROOT/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/_attributes.adoc
rename to extensions/secman/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-markdown/modules/ROOT/examples/.gitkeep b/extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/examples/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-markdown/modules/ROOT/assets/images/.gitkeep b/extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-markdown/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-markdown/modules/ROOT/nav.adoc b/extensions/secman/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/nav.adoc
rename to extensions/secman/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-markdown/modules/ROOT/pages/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/pages/_attributes.adoc
rename to extensions/secman/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-markdown/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-markdown/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/secman/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-secman/modules/ROOT/pages/about.adoc b/extensions/secman/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-secman/modules/ROOT/pages/about.adoc
rename to extensions/secman/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-markdown/sync_examples.sh b/extensions/secman/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-markdown/sync_examples.sh
rename to extensions/secman/_adoc/sync_examples.sh
diff --git a/antora/components/ext-specsupport/antora.yml b/extensions/specsupport/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-specsupport/antora.yml
rename to extensions/specsupport/_adoc/antora.yml
diff --git a/antora/components/ext-fixtures/examples.csv b/extensions/specsupport/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-fixtures/examples.csv
rename to extensions/specsupport/_adoc/examples.csv
diff --git a/antora/components/ext-fixtures/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-fixtures/modules/ROOT/examples/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/examples/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-fixtures/modules/ROOT/assets/images/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/assets/images/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-fixtures/modules/ROOT/assets/attachments/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-fixtures/modules/ROOT/nav.adoc b/extensions/specsupport/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/nav.adoc
rename to extensions/specsupport/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-fixtures/modules/ROOT/pages/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/pages/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-fixtures/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-fixtures/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-specsupport/modules/ROOT/pages/about.adoc b/extensions/specsupport/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-specsupport/modules/ROOT/pages/about.adoc
rename to extensions/specsupport/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-fixtures/sync_examples.sh b/extensions/specsupport/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-fixtures/sync_examples.sh
rename to extensions/specsupport/_adoc/sync_examples.sh
diff --git a/antora/components/ext-viewer-wicket-excel/antora.yml b/extensions/viewer-wicket-excel/_adoc/antora.yml
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/antora.yml
rename to extensions/viewer-wicket-excel/_adoc/antora.yml
diff --git a/antora/components/ext-asciidoc/examples.csv b/extensions/viewer-wicket-excel/_adoc/examples.csv
similarity index 100%
rename from antora/components/ext-asciidoc/examples.csv
rename to extensions/viewer-wicket-excel/_adoc/examples.csv
diff --git a/antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-asciidoc/modules/ROOT/nav.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/nav.adoc
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-asciidoc/sync_examples.sh b/extensions/viewer-wicket-excel/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ext-asciidoc/sync_examples.sh
rename to extensions/viewer-wicket-excel/_adoc/sync_examples.sh
diff --git a/site.yml b/site.yml
index fc0767f..d23d3f4 100644
--- a/site.yml
+++ b/site.yml
@@ -19,22 +19,22 @@ content:
branches: HEAD
- url: .
branches: HEAD
- start_path: antora/components/ext-asciidoc
+ start_path: extensions/asciidoc/_adoc
- url: .
branches: HEAD
- start_path: antora/components/ext-markdown
+ start_path: extensions/markdown/_adoc
- url: .
branches: HEAD
- start_path: antora/components/ext-fixtures
+ start_path: extensions/fixtures/_adoc
- url: .
branches: HEAD
- start_path: antora/components/ext-secman
+ start_path: extensions/secman/_adoc
- url: .
branches: HEAD
- start_path: antora/components/ext-specsupport
+ start_path: extensions/specsupport/_adoc
- url: .
branches: HEAD
- start_path: antora/components/ext-viewer-wicket-excel
+ start_path: extensions/viewer-wicket-excel/_adoc
- url: .
branches: HEAD
start_path: examples/apps/demo/_adoc
[isis] 01/07: ISIS-2062: moves demo docs to demo source code.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0641e233a29e2a76d2c8f116053ee66f17c6bc2a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:09:55 2019 +0100
ISIS-2062: moves demo docs to demo source code.
also changes module titles so that they are ordered better in LHS.
---
antora/components/extensions/antora.yml | 2 +-
antora/components/rg/antora.yml | 2 +-
antora/components/ug/antora.yml | 2 +-
{antora/components/demoapp => examples/apps/demo/_adoc}/antora.yml | 2 +-
{antora/components/demoapp => examples/apps/demo/_adoc}/examples.csv | 0
.../demoapp => examples/apps/demo/_adoc}/modules/ROOT/_attributes.adoc | 0
.../demoapp => examples/apps/demo/_adoc}/modules/ROOT/nav.adoc | 0
.../apps/demo/_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../apps/demo/_adoc}/modules/ROOT/pages/_partials/_attributes.adoc | 0
.../demoapp => examples/apps/demo/_adoc}/modules/ROOT/pages/about.adoc | 0
.../components/demoapp => examples/apps/demo/_adoc}/sync_examples.sh | 0
examples/apps/helloworld/_adoc/antora.yml | 2 +-
examples/apps/simpleapp/_adoc/antora.yml | 2 +-
site.yml | 2 +-
14 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index cab0db4..46631e3 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -1,5 +1,5 @@
name: ext
-title: Extensions
+title: "Extensions"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/rg/antora.yml b/antora/components/rg/antora.yml
index 9980a97..69479bf 100644
--- a/antora/components/rg/antora.yml
+++ b/antora/components/rg/antora.yml
@@ -1,5 +1,5 @@
name: rg
-title: Reference Guides
+title: "Guides - Reference Guides"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/ug/antora.yml b/antora/components/ug/antora.yml
index 11b0b9a..3aad7a3 100644
--- a/antora/components/ug/antora.yml
+++ b/antora/components/ug/antora.yml
@@ -1,5 +1,5 @@
name: ug
-title: User Guides
+title: "Guides - User Guides"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/demoapp/antora.yml b/examples/apps/demo/_adoc/antora.yml
similarity index 75%
rename from antora/components/demoapp/antora.yml
rename to examples/apps/demo/_adoc/antora.yml
index 5768159..e39e66e 100644
--- a/antora/components/demoapp/antora.yml
+++ b/examples/apps/demo/_adoc/antora.yml
@@ -1,5 +1,5 @@
name: demoapp
-title: Demo App
+title: "Example App - Demo"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/demoapp/examples.csv b/examples/apps/demo/_adoc/examples.csv
similarity index 100%
rename from antora/components/demoapp/examples.csv
rename to examples/apps/demo/_adoc/examples.csv
diff --git a/antora/components/demoapp/modules/ROOT/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/demoapp/modules/ROOT/_attributes.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/demoapp/modules/ROOT/nav.adoc b/examples/apps/demo/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/demoapp/modules/ROOT/nav.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/demoapp/modules/ROOT/pages/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/demoapp/modules/ROOT/pages/_attributes.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/demoapp/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/demoapp/modules/ROOT/pages/_partials/_attributes.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/demoapp/modules/ROOT/pages/about.adoc b/examples/apps/demo/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/demoapp/modules/ROOT/pages/about.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/demoapp/sync_examples.sh b/examples/apps/demo/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/demoapp/sync_examples.sh
rename to examples/apps/demo/_adoc/sync_examples.sh
diff --git a/examples/apps/helloworld/_adoc/antora.yml b/examples/apps/helloworld/_adoc/antora.yml
index 987091d..0543740 100644
--- a/examples/apps/helloworld/_adoc/antora.yml
+++ b/examples/apps/helloworld/_adoc/antora.yml
@@ -1,5 +1,5 @@
name: helloworld
-title: Helloworld Example App
+title: "Example App - Hello World"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/examples/apps/simpleapp/_adoc/antora.yml b/examples/apps/simpleapp/_adoc/antora.yml
index 47410ad..ce97f9a 100644
--- a/examples/apps/simpleapp/_adoc/antora.yml
+++ b/examples/apps/simpleapp/_adoc/antora.yml
@@ -1,5 +1,5 @@
name: simpleapp
-title: SimpleApp Example App
+title: "Example App - SimpleApp"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/site.yml b/site.yml
index 8ec5fb3..024ce3f 100644
--- a/site.yml
+++ b/site.yml
@@ -22,7 +22,7 @@ content:
start_path: antora/components/extensions
- url: .
branches: HEAD
- start_path: antora/components/demoapp
+ start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD
start_path: antora/components/downloads
[isis] 03/07: ISIS-2062: moves extensions/mardkwon module to
ext-markdown/ROOT component
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7639c7b60cfb8bcbb13162ff24660a97d5e58273
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:23:49 2019 +0100
ISIS-2062: moves extensions/mardkwon module to ext-markdown/ROOT component
---
antora/components/ext-markdown/antora.yml | 6 ++++
antora/components/ext-markdown/examples.csv | 1 +
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../components/ext-markdown/modules/ROOT/nav.adoc | 2 ++
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
antora/components/ext-markdown/sync_examples.sh | 39 ++++++++++++++++++++++
antora/components/extensions/antora.yml | 1 -
.../extensions/modules/markdown/nav.adoc | 2 --
site.yml | 3 ++
14 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/antora/components/ext-markdown/antora.yml b/antora/components/ext-markdown/antora.yml
new file mode 100644
index 0000000..838d931
--- /dev/null
+++ b/antora/components/ext-markdown/antora.yml
@@ -0,0 +1,6 @@
+name: ext-markdown
+title: "Extensions - Markdown"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/ext-markdown/examples.csv b/antora/components/ext-markdown/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/antora/components/ext-markdown/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/antora/components/extensions/modules/markdown/_attributes.adoc b/antora/components/ext-markdown/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/markdown/_attributes.adoc
rename to antora/components/ext-markdown/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/markdown/examples/.gitkeep b/antora/components/ext-markdown/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/markdown/examples/.gitkeep
rename to antora/components/ext-markdown/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/markdown/assets/images/.gitkeep b/antora/components/ext-markdown/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/markdown/assets/images/.gitkeep
rename to antora/components/ext-markdown/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/markdown/assets/attachments/.gitkeep b/antora/components/ext-markdown/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/markdown/assets/attachments/.gitkeep
rename to antora/components/ext-markdown/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-markdown/modules/ROOT/nav.adoc b/antora/components/ext-markdown/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/antora/components/ext-markdown/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/antora/components/extensions/modules/markdown/pages/_attributes.adoc b/antora/components/ext-markdown/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/markdown/pages/_attributes.adoc
rename to antora/components/ext-markdown/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/markdown/pages/_partials/_attributes.adoc b/antora/components/ext-markdown/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/markdown/pages/_partials/_attributes.adoc
rename to antora/components/ext-markdown/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/markdown/pages/about.adoc b/antora/components/ext-markdown/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/markdown/pages/about.adoc
rename to antora/components/ext-markdown/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-markdown/sync_examples.sh b/antora/components/ext-markdown/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/antora/components/ext-markdown/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index 2e80ed4..ab9cd94 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -8,4 +8,3 @@ nav:
- modules/specsupport/nav.adoc
- modules/secman/nav.adoc
- modules/viewer-wicket-excel/nav.adoc
-- modules/markdown/nav.adoc
diff --git a/antora/components/extensions/modules/markdown/nav.adoc b/antora/components/extensions/modules/markdown/nav.adoc
deleted file mode 100644
index 4c3afe7..0000000
--- a/antora/components/extensions/modules/markdown/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Markdown]
-
diff --git a/site.yml b/site.yml
index 7b27e7e..15a61ee 100644
--- a/site.yml
+++ b/site.yml
@@ -25,6 +25,9 @@ content:
start_path: antora/components/ext-asciidoc
- url: .
branches: HEAD
+ start_path: antora/components/ext-markdown
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD
[isis] 04/07: ISIS-2062: moves extensions/fixtures module to
ext-markdown/ROOT component
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 70ff7280f9a94cc70efddebb8b135ad089ef43e3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:26:16 2019 +0100
ISIS-2062: moves extensions/fixtures module to ext-markdown/ROOT component
---
antora/components/ext-fixtures/antora.yml | 6 ++++
antora/components/ext-fixtures/examples.csv | 1 +
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../components/ext-fixtures/modules/ROOT/nav.adoc | 2 ++
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
antora/components/ext-fixtures/sync_examples.sh | 39 ++++++++++++++++++++++
antora/components/extensions/antora.yml | 1 -
.../extensions/modules/fixtures/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 4 +--
14 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/antora/components/ext-fixtures/antora.yml b/antora/components/ext-fixtures/antora.yml
new file mode 100644
index 0000000..fc4f3a1
--- /dev/null
+++ b/antora/components/ext-fixtures/antora.yml
@@ -0,0 +1,6 @@
+name: ext-fixtures
+title: "Extensions - Fixtures"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/ext-fixtures/examples.csv b/antora/components/ext-fixtures/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/antora/components/ext-fixtures/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/antora/components/extensions/modules/fixtures/_attributes.adoc b/antora/components/ext-fixtures/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/fixtures/_attributes.adoc
rename to antora/components/ext-fixtures/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/fixtures/examples/.gitkeep b/antora/components/ext-fixtures/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/fixtures/examples/.gitkeep
rename to antora/components/ext-fixtures/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/fixtures/assets/images/.gitkeep b/antora/components/ext-fixtures/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/fixtures/assets/images/.gitkeep
rename to antora/components/ext-fixtures/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/fixtures/assets/attachments/.gitkeep b/antora/components/ext-fixtures/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/fixtures/assets/attachments/.gitkeep
rename to antora/components/ext-fixtures/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-fixtures/modules/ROOT/nav.adoc b/antora/components/ext-fixtures/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/antora/components/ext-fixtures/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/antora/components/extensions/modules/fixtures/pages/_attributes.adoc b/antora/components/ext-fixtures/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/fixtures/pages/_attributes.adoc
rename to antora/components/ext-fixtures/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/fixtures/pages/_partials/_attributes.adoc b/antora/components/ext-fixtures/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/fixtures/pages/_partials/_attributes.adoc
rename to antora/components/ext-fixtures/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/fixtures/pages/about.adoc b/antora/components/ext-fixtures/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/fixtures/pages/about.adoc
rename to antora/components/ext-fixtures/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-fixtures/sync_examples.sh b/antora/components/ext-fixtures/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/antora/components/ext-fixtures/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index ab9cd94..12549bd 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -4,7 +4,6 @@ version: master
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
-- modules/fixtures/nav.adoc
- modules/specsupport/nav.adoc
- modules/secman/nav.adoc
- modules/viewer-wicket-excel/nav.adoc
diff --git a/antora/components/extensions/modules/fixtures/nav.adoc b/antora/components/extensions/modules/fixtures/nav.adoc
deleted file mode 100644
index a7bcce2..0000000
--- a/antora/components/extensions/modules/fixtures/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Fixtures]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 1bebc4f..cb4d334 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -60,13 +60,13 @@ include::_attributes.adoc[]
|*Extensions*
* Testing & Prototyping
-** xref:ext:fixtures:about.adoc[Fixtures]
+** xref:ext-fixtures:ROOT:about.adoc[Fixtures]
** xref:ext:specsupport:about.adoc[(BDD) Spec Support]
* Modules
** xref:ext:secman:about.adoc[Security Manager]
** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
* Values Types
-** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext:markdown:about.adoc[Markdown]
+** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext-markdown:ROOT:about.adoc[Markdown]
|*Get involved*