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/04/13 21:21:25 UTC
[isis-app-simpleapp] 01/03: Merge branch 'jpa' into jpa-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 95aa1f937b14d9459e9b6ab0d4f2966c3ed83780
Merge: afe09f5 2e9b151
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:15:01 2021 +0100
Merge branch 'jpa' into jpa-SNAPSHOT
.../domainapp/modules/simple/SimpleModule.java | 32 -
.../modules/simple/dom/so/SimpleObject.java | 21 +-
.../modules/simple/dom/so/SimpleObject.layout.xml | 10 +-
.../modules/simple/dom/so/SimpleObjects.java | 1 -
.../java/domainapp/modules/simple/types/Name.java | 25 +-
webapp-tests/pom.xml | 120 +-
.../domainapp/webapp/bdd/CucumberTestAbstract.java | 34 -
.../domainapp/webapp/bdd/specs/CucumberTest.java | 36 -
.../webapp/bdd/stepdefs/BddStepDefsModule.java | 13 -
.../bdd/stepdefs/domain/SimpleObjectsContext.java | 21 -
.../domain/SimpleObjectsGivenThenStepDef.java | 54 -
.../stepdefs/domain/SimpleObjectsWhenStepDef.java | 41 -
.../stepdefs/fixtures/DomainAppDemoStepDef.java | 21 -
.../stepdefs/infrastructure/BootstrapStepDef.java | 14 -
.../infrastructure/TransactionalStepDef.java | 50 -
.../webapp/integtests/WebAppIntegTestAbstract.java | 2 -
.../metamodel/SwaggerExport_IntegTest.java | 2 +
.../lockdown/LockDownMetaModel_IntegTest.java | 80 --
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 1307 --------------------
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 308 -----
...omainapp.modules.simple.dom.so.SimpleObject.xml | 1252 -------------------
...mainapp.modules.simple.dom.so.SimpleObjects.xml | 287 -----
...app.modules.simple.types.Name$Specification.xml | 39 -
...omainAppFixtureScriptsSpecificationProvider.xml | 52 -
...tion.services.health.HealthCheckServiceImpl.xml | 52 -
...ication.services.homepage.HomePageViewModel.xml | 688 -----------
.../metamodel/lockdown/current/.gitignore | 1 -
.../unittests/archunit/ArchitectureTests.java | 52 -
.../mavendeps/lockdown/LockDownMavenDeps_Test.java | 71 --
.../approved/LockDownMavenDeps_Test.list.txt | 299 -----
.../approved/LockDownMavenDeps_Test.tree.txt | 298 -----
.../mavendeps/lockdown/current/.gitignore | 1 -
.../util/CurrentVsApprovedApprovalTextWriter.java | 13 -
.../SimpleObjectSpec_listAllAndCreate.feature | 14 -
.../bdd/specs/SimpleObjectSpec_updateName.feature | 16 -
webapp/src/main/resources/application.yml | 8 -
webapp/src/main/resources/menubars.layout.xml | 89 +-
webapp/src/main/webapp/WEB-INF/translations-es.po | 594 ---------
webapp/src/main/webapp/WEB-INF/translations.po | 594 ---------
39 files changed, 52 insertions(+), 6560 deletions(-)
diff --cc webapp/src/main/resources/application.yml
index be99746,394dc2b..125c1f9
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@@ -101,11 -101,8 +101,3 @@@ management
health:
enabled: true
- app:
- simple-module:
- types:
- name:
- validation:
- message: "'{character}' is invalid."
- prohibited-characters: "&%$!"
-
-# workaround for https://issues.apache.org/jira/browse/ISIS-2583: not used, but needed to prevent NPE
-datanucleus:
- cache:
- level2:
- type: soft