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:14:01 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (bcb4008 ->
60bf37c)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
from bcb4008 updates parent pom to 2.0.0-M5.20210413-1443-108a3a48
add e6bddf1 simplifies SimpleObject.layout.xml
add 7783e86 for menubar, adds section names, simplifies
add c93c384 Removes the custom (application) configuration properties
add cb23f0d removes archunit and lockdown tests
add 4d3521f adds @DirtiesContext for SwaggerExport_IntegTest
add 08d9e21 removes BDD tests
add 3f170ae removes (unused) translation files
new b8dc865 Merge branch 'jdo' into jdo-SNAPSHOT
new 60bf37c replaces @MemberOrder with @PropertyLayout
The 2 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:
.../domainapp/modules/simple/SimpleModule.java | 33 -
.../modules/simple/dom/so/SimpleObject.java | 22 +-
.../modules/simple/dom/so/SimpleObject.layout.xml | 10 +-
.../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 | 85 +-
webapp/src/main/webapp/WEB-INF/translations-es.po | 594 ---------
webapp/src/main/webapp/WEB-INF/translations.po | 594 ---------
38 files changed, 52 insertions(+), 6557 deletions(-)
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/specs/CucumberTest.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/BddStepDefsModule.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsContext.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsGivenThenStepDef.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsWhenStepDef.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObject.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObjects.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.types.Name$Specification.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.health.HealthCheckServiceImpl.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/current/.gitignore
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/LockDownMavenDeps_Test.java
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.list.txt
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.tree.txt
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/current/.gitignore
delete mode 100644 webapp-tests/src/test/java/domainapp/webapp/util/CurrentVsApprovedApprovalTextWriter.java
delete mode 100644 webapp-tests/src/test/resources/domainapp/webapp/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
delete mode 100644 webapp-tests/src/test/resources/domainapp/webapp/bdd/specs/SimpleObjectSpec_updateName.feature
delete mode 100644 webapp/src/main/webapp/WEB-INF/translations-es.po
delete mode 100644 webapp/src/main/webapp/WEB-INF/translations.po
[isis-app-simpleapp] 01/02: Merge branch 'jdo' into jdo-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit b8dc86546f4d9179347ab3455654647689bd361c
Merge: bcb4008 3f170ae
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:04:06 2021 +0100
Merge branch 'jdo' into jdo-SNAPSHOT
.../domainapp/modules/simple/SimpleModule.java | 33 -
.../modules/simple/dom/so/SimpleObject.java | 22 +-
.../modules/simple/dom/so/SimpleObject.layout.xml | 10 +-
.../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 | 85 +-
webapp/src/main/webapp/WEB-INF/translations-es.po | 594 ---------
webapp/src/main/webapp/WEB-INF/translations.po | 594 ---------
38 files changed, 52 insertions(+), 6557 deletions(-)
[isis-app-simpleapp] 02/02: replaces @MemberOrder with
@PropertyLayout
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 60bf37cae7c3bedbf83f74ce04cd1d264cdba87e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:13:09 2021 +0100
replaces @MemberOrder with @PropertyLayout
---
.../src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 2be41ce..fede697 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -12,8 +12,8 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -74,12 +74,12 @@ public class SimpleObject implements Comparable<SimpleObject> {
@Name
@Getter @Setter @ToString.Include
- @MemberOrder(name = "Name", sequence = "1")
+ @PropertyLayout(fieldSetId = "name", sequence = "1")
private String name;
@Notes
@Getter @Setter
- @MemberOrder(name = "Name", sequence = "2")
+ @PropertyLayout(fieldSetId = "name", sequence = "2")
private String notes;