You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/05/19 07:08:31 UTC
[isis] branch master updated: ISIS-2620: Demo: work on JPA
provisioning issues
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5122597 ISIS-2620: Demo: work on JPA provisioning issues
5122597 is described below
commit 5122597ed4cf8d1f700b91ffaee3274ebc5f89e3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 19 09:07:18 2021 +0200
ISIS-2620: Demo: work on JPA provisioning issues
---
.../demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java | 4 +++-
.../demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java | 6 ++++--
.../extensions/secman/jpa/role/dom/ApplicationRoleRepository.java | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index 036f401..bc18273 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@ -29,6 +29,7 @@ import javax.jdo.annotations.PersistenceCapable;
import org.springframework.context.annotation.Profile;
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.Editing;
import org.apache.isis.applib.annotation.Property;
@@ -74,7 +75,8 @@ public class EventLogEntryJdo {
@Getter @Setter
private Acknowledge acknowledge;
- @Action(associateWith = "acknowledge")
+ @Action
+ @ActionLayout(associateWith = "acknowledge")
public EventLogEntryJdo acknowledge(Acknowledge acknowledge) {
setAcknowledge(acknowledge);
return this;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
index ce9777d..f266360 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
@@ -26,6 +26,7 @@ import javax.persistence.Entity;
import org.springframework.context.annotation.Profile;
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.Editing;
import org.apache.isis.applib.annotation.Property;
@@ -38,7 +39,7 @@ import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonE
@Profile("demo-jpa")
@Entity
-@DomainObject
+@DomainObject(objectType = "demo.EventLogEntryJpa")
public class EventLogEntryJpa {
public static EventLogEntryJpa of(UiButtonEvent even) {
@@ -70,7 +71,8 @@ public class EventLogEntryJpa {
@Getter @Setter
private Acknowledge acknowledge;
- @Action(associateWith = "acknowledge")
+ @Action
+ @ActionLayout(associateWith = "acknowledge")
public EventLogEntryJpa acknowledge(Acknowledge acknowledge) {
setAcknowledge(acknowledge);
return this;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
index 4e871b4..6b7c89d 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
@@ -27,9 +27,9 @@ import org.apache.isis.extensions.secman.api.role.dom.ApplicationRoleRepositoryA
@Repository
@Named("isis.ext.secman.ApplicationRoleRepository")
public class ApplicationRoleRepository
-extends ApplicationRoleRepositoryAbstract {
+extends ApplicationRoleRepositoryAbstract<ApplicationRole> {
- public ApplicationRoleRepository(Class applicationRoleClass) {
+ public ApplicationRoleRepository() {
super(ApplicationRole.class);
}