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 2018/01/24 15:16:54 UTC
[isis] 18/20: ISIS-1569: updates XSDs for docs,
and adds in the historical previous versions also.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-1569-replay-commands
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fad907f97a2e1ae9925feef2bb959deebafb0473
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 19 16:50:19 2018 +0000
ISIS-1569: updates XSDs for docs, and adds in the historical previous versions also.
---
.../asciidoc/schema/chg/{chg.xsd => chg-1.1.xsd} | 6 +--
.../src/main/asciidoc/schema/chg/chg.xsd | 6 +--
.../asciidoc/schema/cmd/{cmd.xsd => cmd-1.2.xsd} | 10 ++---
.../asciidoc/schema/cmd/{cmd.xsd => cmd-1.3.xsd} | 18 +++++---
.../asciidoc/schema/cmd/{cmd.xsd => cmd-1.4.xsd} | 51 +++++++++++++++++++---
.../src/main/asciidoc/schema/cmd/cmd.xsd | 51 +++++++++++++++++++---
.../schema/common/{common.xsd => common-1.1.xsd} | 19 ++++++--
.../src/main/asciidoc/schema/common/common.xsd | 19 ++++++--
.../asciidoc/schema/ixn/{ixn.xsd => ixn-1.1.xsd} | 10 ++---
.../asciidoc/schema/ixn/{ixn.xsd => ixn-1.2.xsd} | 16 ++++---
.../asciidoc/schema/ixn/{ixn.xsd => ixn-1.3.xsd} | 14 ++++--
.../src/main/asciidoc/schema/ixn/ixn.xsd | 14 ++++--
12 files changed, 183 insertions(+), 51 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd b/adocs/documentation/src/main/asciidoc/schema/chg/chg-1.1.xsd
similarity index 93%
copy from adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd
copy to adocs/documentation/src/main/asciidoc/schema/chg/chg-1.1.xsd
index 41501de..cb55449 100644
--- a/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/chg/chg-1.1.xsd
@@ -24,11 +24,11 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
<xs:element name="changesDto">
<xs:annotation>
- <xs:documentation>The changes (create/update/delete) to one or more domain objects within a transaction. (nb: only published objects are included in these lists).
+ <xs:documentation>Represents v1.1 of this schema (as per majorVersion.minorVersion @default attribute, below). The changes (create/update/delete) to one or more domain objects within a transaction. (nb: only published objects are included in these lists).
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -39,7 +39,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd b/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd
index 41501de..cb55449 100644
--- a/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/chg/chg.xsd
@@ -24,11 +24,11 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
<xs:element name="changesDto">
<xs:annotation>
- <xs:documentation>The changes (create/update/delete) to one or more domain objects within a transaction. (nb: only published objects are included in these lists).
+ <xs:documentation>Represents v1.1 of this schema (as per majorVersion.minorVersion @default attribute, below). The changes (create/update/delete) to one or more domain objects within a transaction. (nb: only published objects are included in these lists).
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -39,7 +39,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.2.xsd
similarity index 95%
copy from adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
copy to adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.2.xsd
index e3aa0b9..8073266 100644
--- a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.2.xsd
@@ -23,11 +23,11 @@
xmlns="http://isis.apache.org/schema/cmd"
xmlns:com="http://isis.apache.org/schema/common">
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
<xs:element name="commandDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema.
+ <xs:documentation>Represents v1.2 of this schema.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -38,9 +38,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="2">
<xs:annotation>
- <xs:documentation>Introduced in v1.1. The minor version of the schema that an XML instance was created using.
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -148,4 +148,4 @@
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.3.xsd
similarity index 88%
copy from adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
copy to adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.3.xsd
index e3aa0b9..6f14ad1 100644
--- a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.3.xsd
@@ -23,11 +23,11 @@
xmlns="http://isis.apache.org/schema/cmd"
xmlns:com="http://isis.apache.org/schema/common">
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
<xs:element name="commandDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema.
+ <xs:documentation>Represents v1.3 of this schema, adding in 'logicalMemberIdentifier'
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -38,9 +38,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="3">
<xs:annotation>
- <xs:documentation>Introduced in v1.1. The minor version of the schema that an XML instance was created using.
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -77,9 +77,15 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
- <xs:documentation>Formal identifier of the member being interacted with (action or property).
+ <xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -148,4 +154,4 @@
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.4.xsd
similarity index 73%
copy from adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
copy to adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.4.xsd
index e3aa0b9..3ff2e90 100644
--- a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd-1.4.xsd
@@ -23,11 +23,22 @@
xmlns="http://isis.apache.org/schema/cmd"
xmlns:com="http://isis.apache.org/schema/common">
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+
+ <xs:element name="commandsDto">
+ <xs:annotation>
+ <xs:documentation>Collection of commandDto's</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="commandDto"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="commandDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema.
+ <xs:documentation>Represents v1.4 of this schema (as per majorVersion.minorVersion @default attribute, below). Adds in 'commandsDto' and extending 'commandDto' to allow additional implementation-specific fields to be attached in 'userData' (a map).
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -38,9 +49,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="4">
<xs:annotation>
- <xs:documentation>Introduced in v1.1. The minor version of the schema that an XML instance was created using.
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -67,6 +78,18 @@
<xs:documentation>The action or property (identifier and parameter arguments) to be invoked on the target object(s).</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="timings" type="com:periodDto" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The time taken to perform the command. Used for replaying the command on a replica slave.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="userData" type="mapDto" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Custom user data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -77,9 +100,15 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
- <xs:documentation>Formal identifier of the member being interacted with (action or property).
+ <xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -147,5 +176,17 @@
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="mapDto">
+ <xs:sequence>
+ <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="key" type="xs:string"/>
+ <xs:element name="value" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
index e3aa0b9..3ff2e90 100644
--- a/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/cmd/cmd.xsd
@@ -23,11 +23,22 @@
xmlns="http://isis.apache.org/schema/cmd"
xmlns:com="http://isis.apache.org/schema/common">
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+
+ <xs:element name="commandsDto">
+ <xs:annotation>
+ <xs:documentation>Collection of commandDto's</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="commandDto"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="commandDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema.
+ <xs:documentation>Represents v1.4 of this schema (as per majorVersion.minorVersion @default attribute, below). Adds in 'commandsDto' and extending 'commandDto' to allow additional implementation-specific fields to be attached in 'userData' (a map).
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -38,9 +49,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="4">
<xs:annotation>
- <xs:documentation>Introduced in v1.1. The minor version of the schema that an XML instance was created using.
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -67,6 +78,18 @@
<xs:documentation>The action or property (identifier and parameter arguments) to be invoked on the target object(s).</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="timings" type="com:periodDto" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The time taken to perform the command. Used for replaying the command on a replica slave.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="userData" type="mapDto" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Custom user data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -77,9 +100,15 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
- <xs:documentation>Formal identifier of the member being interacted with (action or property).
+ <xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -147,5 +176,17 @@
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="mapDto">
+ <xs:sequence>
+ <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="key" type="xs:string"/>
+ <xs:element name="value" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/adocs/documentation/src/main/asciidoc/schema/common/common.xsd b/adocs/documentation/src/main/asciidoc/schema/common/common-1.1.xsd
similarity index 91%
copy from adocs/documentation/src/main/asciidoc/schema/common/common.xsd
copy to adocs/documentation/src/main/asciidoc/schema/common/common-1.1.xsd
index 041208c..ab26815 100644
--- a/adocs/documentation/src/main/asciidoc/schema/common/common.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/common/common-1.1.xsd
@@ -42,6 +42,7 @@
<xs:element name="timestamp" type="xs:dateTime"/>
<xs:element name="enum" type="enumDto"/>
<xs:element name="reference" type="oidDto"/>
+ <xs:element name="collection" type="collectionDto"/>
</xs:choice>
</xs:complexType>
@@ -67,6 +68,18 @@
<xs:attribute name="id" type="xs:string"/>
</xs:complexType>
+ <xs:complexType name="collectionDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="value" type="valueDto" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="type" use="required" type="valueType"/>
+ <xs:attribute name="null" use="optional" type="xs:boolean"/>
+ </xs:complexType>
+
<xs:complexType name="oidsDto">
<xs:annotation>
<xs:documentation>A list of OIDs
@@ -112,10 +125,10 @@
<xs:enumeration value="jodaLocalDateTime"/>
<xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
+ <xs:enumeration value="collection"/>
<xs:enumeration value="void">
<xs:annotation>
- <xs:documentation>
- Not valid to be used as the parameter type of an action; can be used as its return type.
+ <xs:documentation>Not valid to be used as the parameter type of an action; can be used as its return type.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
@@ -188,4 +201,4 @@
</xs:restriction>
</xs:simpleType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/common/common.xsd b/adocs/documentation/src/main/asciidoc/schema/common/common.xsd
index 041208c..ab26815 100644
--- a/adocs/documentation/src/main/asciidoc/schema/common/common.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/common/common.xsd
@@ -42,6 +42,7 @@
<xs:element name="timestamp" type="xs:dateTime"/>
<xs:element name="enum" type="enumDto"/>
<xs:element name="reference" type="oidDto"/>
+ <xs:element name="collection" type="collectionDto"/>
</xs:choice>
</xs:complexType>
@@ -67,6 +68,18 @@
<xs:attribute name="id" type="xs:string"/>
</xs:complexType>
+ <xs:complexType name="collectionDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="value" type="valueDto" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="type" use="required" type="valueType"/>
+ <xs:attribute name="null" use="optional" type="xs:boolean"/>
+ </xs:complexType>
+
<xs:complexType name="oidsDto">
<xs:annotation>
<xs:documentation>A list of OIDs
@@ -112,10 +125,10 @@
<xs:enumeration value="jodaLocalDateTime"/>
<xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
+ <xs:enumeration value="collection"/>
<xs:enumeration value="void">
<xs:annotation>
- <xs:documentation>
- Not valid to be used as the parameter type of an action; can be used as its return type.
+ <xs:documentation>Not valid to be used as the parameter type of an action; can be used as its return type.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
@@ -188,4 +201,4 @@
</xs:restriction>
</xs:simpleType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.1.xsd
similarity index 97%
copy from adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
copy to adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.1.xsd
index dc7908f..e8ccfe5 100644
--- a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.1.xsd
@@ -25,12 +25,12 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
- <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.2.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema, replacing and generalizing the earlier 'actionInvocationMemento'.
+ <xs:documentation>Represents v1.1 of this schema. This schema replaces and generalizes the earlier 'actionInvocationMemento'.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -41,7 +41,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -212,4 +212,4 @@
</xs:sequence>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.2.xsd
similarity index 94%
copy from adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
copy to adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.2.xsd
index dc7908f..21d375b 100644
--- a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.2.xsd
@@ -25,12 +25,12 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
- <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.3.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema, replacing and generalizing the earlier 'actionInvocationMemento'.
+ <xs:documentation>Represents v1.2 of this schema, adding in 'logicalMemberIdentifier'.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -41,7 +41,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -77,6 +77,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
<xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
@@ -212,4 +218,4 @@
</xs:sequence>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.3.xsd
similarity index 94%
copy from adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
copy to adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.3.xsd
index dc7908f..63380a8 100644
--- a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn-1.3.xsd
@@ -25,12 +25,12 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
- <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.4.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema, replacing and generalizing the earlier 'actionInvocationMemento'.
+ <xs:documentation>Represents v1.3 of this schema (as per majorVersion.minorVersion @default attribute, below); just updates to use cmd v1.4 schema.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -41,7 +41,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="3">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -77,6 +77,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
<xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
diff --git a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
index dc7908f..63380a8 100644
--- a/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
+++ b/adocs/documentation/src/main/asciidoc/schema/ixn/ixn.xsd
@@ -25,12 +25,12 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.0.xsd"/>
- <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.4.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <xs:documentation>Represents v1.0 of this schema, replacing and generalizing the earlier 'actionInvocationMemento'.
+ <xs:documentation>Represents v1.3 of this schema (as per majorVersion.minorVersion @default attribute, below); just updates to use cmd v1.4 schema.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -41,7 +41,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="3">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -77,6 +77,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="logicalMemberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Logical formal identifier (object type, as per @DomainObject(objectType=), and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="memberIdentifier" type="xs:string">
<xs:annotation>
<xs:documentation>Formal identifier (class name and member name) of the member being interacted with (action or property).
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.