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 2016/04/14 12:11:38 UTC
[29/31] isis git commit: ISIS-1371: slightly changed (simplified) the
way to capture the mixin object for an ActionInvocationMementoDto.
ISIS-1371: slightly changed (simplified) the way to capture the mixin object for an ActionInvocationMementoDto.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9e155311
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9e155311
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9e155311
Branch: refs/heads/ISIS-1291
Commit: 9e1553114f0ba6ef593e511657cf9df6fc8a9c3c
Parents: 4bb2485
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 14 10:50:34 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 14 10:50:34 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/schema/aim/aim-1.0.xsd | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9e155311/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-1.0.xsd
----------------------------------------------------------------------
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-1.0.xsd b/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-1.0.xsd
index 1d14b47..36b952f 100644
--- a/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-1.0.xsd
+++ b/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-1.0.xsd
@@ -80,10 +80,17 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="mixinFqClassName" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Introduced in v1.1. Populated only for mixin actions, is the fully qualified class name of the mixin type. This element is optional for backward compatibility, but will be populated for any 1.1+ instances of this schema for to mixin actions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="target" type="common:oidDto">
<xs:annotation>
<xs:documentation>
- For regular actions, represents the entity or view model upon which the action is invoked. For mixin actions, is the mixin object itself; use the 'mixedIn' element (in the payload) to obtain the entity or view model being contributed to (is the constructor arg to the mixin). For contributed actions, is the domain service (the contributee object will be one of the action arguments within the payload).s
+ For regular actions, represents the entity or view model upon which the action is invoked. For mixin actions, is the object being mixed-into (the constructor arg to the mixin). For contributed actions, is the domain service (the contributee object will be one of the action arguments within the payload). Mixin actions can be determined by the presence of the 'mixinClass' element (1.1+ instances of the schema).
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -118,7 +125,7 @@
<xs:element name="title" type="xs:string">
<xs:annotation>
<xs:documentation>
- User-friendly title of the 'target' object, or of the 'mixin' object if populated.
+ User-friendly title of the 'target' object.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -128,13 +135,6 @@
<xs:element name="payload">
<xs:complexType>
<xs:sequence>
- <xs:element name="mixedIn" type="common:oidDto" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>
- Introduced in v1.1. Populated only for mixin actions, the entity or view model being contributed to (is the constructor arg to the mixin).
- </xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="parameters">
<xs:complexType>
<xs:sequence maxOccurs="unbounded">