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 2020/12/22 03:23:41 UTC
[isis] branch master updated: ISIS-2033: fixes (demo, wrapper)
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 18fdb51 ISIS-2033: fixes (demo, wrapper)
18fdb51 is described below
commit 18fdb51487184d62198959423fc0fa4e97612f0f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 04:22:17 2020 +0100
ISIS-2033: fixes (demo, wrapper)
---
.../java/org/apache/isis/applib/services/metamodel/BeanSort.java | 2 +-
.../java/demoapp/dom/extensions/secman/apptenancy/AppTenancyVm.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
index 6e03872..18a0cf0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
@@ -121,7 +121,7 @@ public enum BeanSort {
}
public boolean isWrappingSupported() {
- return isMixin() || isViewModel() || isEntity();
+ return isMixin() || isViewModel() || isEntity() || isManagedBean();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/apptenancy/AppTenancyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/apptenancy/AppTenancyVm.java
index b12f2af..f731ccd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/apptenancy/AppTenancyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/apptenancy/AppTenancyVm.java
@@ -24,6 +24,7 @@ import javax.inject.Inject;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Action;
@@ -91,10 +92,10 @@ public class AppTenancyVm implements HasAsciiDocDescription {
//end::disableRegex[]
- @Inject
+ @Inject @XmlTransient
TenantedJdoEntities tenantedJdoEntities;
- @Inject
+ @Inject @XmlTransient
ApplicationTenancyEvaluatorForDemo applicationTenancyEvaluatorForDemo;
}