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 2021/06/08 08:25:48 UTC

[isis] 01/01: Merge pull request #586 from apache/ISIS-2717

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

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

commit 02b3e24bdbe60561ca190533730705cfe7c84332
Merge: 954292c 27686d6
Author: Dan Haywood <da...@apache.org>
AuthorDate: Tue Jun 8 09:25:39 2021 +0100

    Merge pull request #586 from apache/ISIS-2717
    
    Isis 2717 : FixtureScriptsSpecificationProvider now optional, can define using config properties instead.

 .../comguide/modules/ROOT/pages/starter-apps.adoc  |   8 +-
 .../pages/index/annotation/DomainObject.adoc       |  12 +-
 .../pages/index/graph/tree/LazyTreeNode.adoc       |  20 --
 .../applib/pages/index/graph/tree/TreeNode.adoc    |   6 +-
 .../services/appfeat/ApplicationFeatureId.adoc     |   1 +
 .../pages/index/services/metamodel/Config.adoc     |  13 +-
 .../index/services/metamodel/DomainMember.adoc     |   2 +
 .../index/services/metamodel/MetaModelService.adoc |   2 +-
 .../services/metamodel/MetaModelServiceMenu.adoc   |   2 +-
 .../index/services/repository/EntityState.adoc     |  28 +-
 .../services/repository/RepositoryService.adoc     |  52 ----
 .../manager/AnonymousInteractionFactory.adoc}      |  31 +-
 .../index/secman/applib/SecmanConfiguration.adoc   |   9 +-
 ...PermissionsEvaluationServiceAllowBeatsVeto.adoc |   7 +
 ...PermissionsEvaluationServiceVetoBeatsAllow.adoc |   7 +
 .../seed/IsisExtH2ConsoleRoleAndPermissions.adoc   |   1 +
 .../authenticator/AuthenticatorSecman.adoc}        |  19 +-
 .../AuthenticatorSecmanAutoConfiguration.adoc}     |   9 +-
 .../IsisIntegrationTestAbstractWithFixtures.adoc}  |   6 +-
 .../index/fixtures/applib/clock/clock/Clock.adoc   |  80 +++++
 .../fixtures/applib/clock/clock/FixtureClock.adoc  | 117 +++++++
 .../applib/clock/clock/TickingFixtureClock.adoc    |  89 ++++++
 .../applib/clock/fixture/TickingClockFixture.adoc} |   9 +-
 .../applib/events/FixturesInstalledEvent.adoc}     |   7 +-
 .../applib/events/FixturesInstallingEvent.adoc}    |   7 +-
 .../applib/fixturescripts/ExecutionParameters.adoc |  49 +++
 .../fixturescripts/ExecutionParametersDefault.adoc |  53 ++++
 .../ExecutionParametersService.adoc}               |  11 +-
 ...xecutionParametersServiceAutoConfiguration.adoc |  27 ++
 .../applib/fixturescripts/FixtureResult.adoc}      |  11 +-
 .../applib/fixturescripts/FixtureResultList.adoc   |  36 +++
 .../applib/fixturescripts/FixtureScript.adoc       |  52 ++++
 .../FixtureScriptWithExecutionStrategy.adoc}       |  11 +-
 .../applib/fixturescripts/FixtureScripts.adoc      | 168 ++++++++++
 .../FixtureScripts~MultipleExecutionStrategy.adoc  |  68 ++++
 ...ixtureScripts~NonPersistedObjectsStrategy.adoc} |  10 +-
 .../FixtureScript~ExecutionContext.adoc            | 138 +++++++++
 ...xtureScripts_020-configuration-properties.adoc} |  13 +-
 .../fixturespec/FixtureScriptsSpecification.adoc   |  44 +++
 .../applib/modules/ModuleWithFixtures.adoc         |  50 +++
 .../applib/modules/ModuleWithFixturesService.adoc} |  13 +-
 .../applib/personas/BuilderScriptAbstract.adoc     |  21 ++
 .../applib/personas/BuilderScriptWithResult.adoc}  |  22 +-
 .../personas/BuilderScriptWithoutResult.adoc}      |  21 +-
 .../applib/personas/PersonaWithBuilderScript.adoc  |  29 ++
 .../applib/personas/PersonaWithFinder.adoc         |  29 ++
 .../fixtures/applib/personas/WithPrereqs.adoc}     |  12 +-
 .../applib/services/FixturesLifecycleService.adoc} |   9 +-
 .../applib/setup/PersonaEnumPersistAll.adoc}       |  13 +-
 .../teardown/jdo/TeardownFixtureJdoAbstract.adoc}  |   6 +-
 .../viewer/IsisModuleViewerWicketViewer.adoc       |   1 +
 core/adoc/modules/_overview/pages/about.adoc       | 137 +++------
 .../sections/isis.core.meta-model.validator.adoc   |   5 +-
 .../config/pages/sections/isis.extensions.adoc     | 112 +++++++
 .../config/pages/sections/isis.testing.adoc        |  74 ++++-
 .../config/pages/sections/isis.viewer.wicket.adoc  |  64 ++++
 .../apache/isis/core/config/IsisConfiguration.java | 140 +++++++++
 .../additional-spring-configuration-metadata.json  |  18 ++
 .../DemoFixtureScriptSpecificationProvider.java    |  40 ---
 .../src/main/java/demoapp/dom/menubars.layout.xml  | 141 +++------
 .../demo/domain/src/main/resources/application.yml |  12 +-
 .../secondary/clock/TickingClockService.java       |   4 +-
 extensions/security/secman/applib/pom.xml          |   2 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.java |   4 +
 extensions/security/secman/integration/pom.xml     |   2 +-
 .../AuthenticatorSecmanAutoConfiguration.java      |   2 +-
 .../snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt    |   2 +-
 .../springdata/SpringDataJpaBootstrappingTest.java |  34 +-
 .../resources/application-config-test.properties   |   1 -
 .../conf/Configuration_usingSpringDataJpa.java     |   4 +-
 .../isis/testdomain/jdo/JdoTestDomainPersona.java  |   8 +-
 .../isis/testdomain/jpa/JpaTestDomainPersona.java  |   8 +-
 security/adoc/modules/ROOT/pages/about.adoc        |   2 +-
 .../modules/ROOT/pages/usage-by-isis-viewers.adoc  |   3 -
 .../src/main/adoc/modules/shiro/pages/about.adoc   |   2 +-
 .../adoc/modules/starters/pages/simpleapp.adoc     |   5 -
 .../pages/fixture-scripts/api-and-usage.adoc       | 254 +++++++--------
 .../pages/services/ExecutionParametersService.adoc |  26 --
 .../fixtures/pages/services/FixtureScripts.adoc    |  62 ----
 .../FixtureScriptsSpecificationProvider.adoc       |  68 ----
 .../adoc/modules/fixtures/partials/module-nav.adoc |   4 -
 .../IsisIntegrationTestAbstractWithFixtures.java   |  13 +-
 .../applib/IsisModuleTestingFixturesApplib.java    |   3 +-
 .../testing/fixtures/applib/api/package-info.java  |  26 --
 .../applib/clock/{fixture => }/ClockFixture.java   |   8 +-
 .../clock/{fixture => }/TickingClockFixture.java   |  13 +-
 .../fixtures/applib/clock/{ => clock}/Clock.java   |   4 +-
 .../applib/clock/{ => clock}/FixtureClock.java     |   4 +-
 .../clock/{ => clock}/TickingFixtureClock.java     |   5 +-
 .../applib/events/FixturesInstalledEvent.java      |   3 +
 .../applib/events/FixturesInstallingEvent.java     |   3 +
 .../applib/fixturescripts/ExecutionParameters.java | 341 ++++-----------------
 ...meters.java => ExecutionParametersDefault.java} |  14 +-
 .../fixturescripts/ExecutionParametersService.java |  21 +-
 ...xecutionParametersServiceAutoConfiguration.java |  35 ++-
 .../applib/fixturescripts/FixtureResult.java       |   3 +
 .../applib/fixturescripts/FixtureResultList.java   |   4 +-
 .../applib/fixturescripts/FixtureScript.java       |  95 +++++-
 .../FixtureScriptWithExecutionStrategy.java        |  15 +-
 .../applib/fixturescripts/FixtureScripts.java      | 153 ++++++---
 .../FixtureScriptsSpecification.java               |  17 +-
 .../FixtureScriptsSpecificationProvider.java       |  15 +-
 ...iptsSpecificationProviderAutoConfiguration.java |  73 +++++
 .../fixtures/applib/fixturespec/package-info.java  |  25 --
 .../applib/modules/ModuleWithFixtures.java         |   2 +
 .../applib/modules/ModuleWithFixturesService.java  |   5 +-
 .../BuilderScriptAbstract.java                     |  23 +-
 .../BuilderScriptWithResult.java                   |  29 +-
 .../BuilderScriptWithoutResult.java                |  11 +-
 .../PersonaWithBuilderScript.java                  |  19 +-
 .../{api => personas}/PersonaWithFinder.java       |  23 +-
 .../applib/{api => personas}/WithPrereqs.java      |  16 +-
 .../QueryResultsCacheControlDefault.java           |   2 +-
 .../applib/services/FixturesLifecycleService.java  |   9 +-
 .../applib/setup/PersonaEnumPersistAll.java        |   9 +-
 .../teardown/jdo/TeardownFixtureJdoAbstract.java   |   3 +
 .../src/main/resources/META-INF/spring.factories   |   3 +
 ...ContextTest.java => ExecutionContext_Test.java} |   8 +-
 ...utionParametersDefault_AsKeyValueMap_Test.java} |  14 +-
 ...t.java => ExecutionParametersDefault_Test.java} |   6 +-
 .../legacy/FixtureClockInstantiationTest.java      |   4 +-
 121 files changed, 2513 insertions(+), 1267 deletions(-)