This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-2485
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/CAUSEWAY-2485 by this push:
new 472c6689c5 CAUSEWAY-2485: fixes minor bugs with demo app
472c6689c5 is described below
commit 472c6689c5499de94ee94be3d4f360d87959b187
Author: danhaywood <[email protected]>
AuthorDate: Tue May 23 08:53:18 2023 +0100
CAUSEWAY-2485: fixes minor bugs with demo app
---
.../DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java | 2 +-
.../DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java | 4 ++--
.../DomainObjectXxxLifecycleEventPage_deleteEntity.java | 1 +
examples/demo/enhance.sh | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
index 45d5802347..1924c86f7c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
@@ -41,9 +41,9 @@ import
demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity
table = "DomainObjectAliasedEntity"
)
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("demo.party.Customer") // <.>
//tag::class[]
// ...
+@Named("demo.party.Customer") // <.>
@DomainObject(
nature = Nature.ENTITY,
aliased = {"demo.customer.Customer"} // <.>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
index 70d726b31a..67e585a250 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
@@ -44,10 +44,10 @@ import
demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity
name = "DomainObjectAliasedEntity"
)
@EntityListeners(CausewayEntityListener.class)
-@Named("demo.party.Customer") // <.>
-@NoArgsConstructor
//tag::class[]
// ...
+@Named("demo.party.Customer") // <.>
+@NoArgsConstructor
@DomainObject(
nature = Nature.ENTITY,
aliased = {"demo.customer.Customer"} // <.>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
index db202b9819..57b26b09e5 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
@@ -37,6 +37,7 @@ public class DomainObjectXxxLifecycleEventPage_deleteEntity {
private final DomainObjectXxxLifecycleEventPage page;
@MemberSupport public DomainObjectXxxLifecycleEventPage act() {
objectRepository.remove(page.getEntity());
+ page.setEntity(null);
return page;
}
@MemberSupport public String disableAct() {
diff --git a/examples/demo/enhance.sh b/examples/demo/enhance.sh
index fa01e0581a..433b09d58f 100644
--- a/examples/demo/enhance.sh
+++ b/examples/demo/enhance.sh
@@ -19,4 +19,4 @@
#
#
-mvn compile datanucleus:enhance@process-classes -Dmodule-examples-demo-wicket
+mvn compile datanucleus:enhance@process-classes -Dmodule-examples-demo-wicket
-pl domain
