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/01/15 17:07:26 UTC
[isis] branch master updated: ISIS-2263: update published XSD
catalog + sync adoc
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 752ea72 ISIS-2263: update published XSD catalog + sync adoc
752ea72 is described below
commit 752ea7240f5e42c0a633c9ca25ce7f3f8bba173a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 15 18:07:15 2020 +0100
ISIS-2263: update published XSD catalog + sync adoc
---
.../schema/chg/{chg.xsd => chg-2.0.xsd} | 8 +--
antora/supplemental-ui/schema/chg/chg.xsd | 8 +--
.../schema/cmd/{cmd.xsd => cmd-2.0.xsd} | 14 +++--
antora/supplemental-ui/schema/cmd/cmd.xsd | 14 +++--
.../schema/common/{common.xsd => common-2.0.xsd} | 62 +++++++++++++++++-----
antora/supplemental-ui/schema/common/common.xsd | 62 +++++++++++++++++-----
.../schema/ixn/{ixn.xsd => ixn-2.0.xsd} | 12 ++---
antora/supplemental-ui/schema/ixn/ixn.xsd | 12 ++---
.../metamodel/{metamodel.xsd => metamodel-2.0.xsd} | 2 +-
.../supplemental-ui/schema/metamodel/metamodel.xsd | 2 +-
.../examples/value/NamedWithMimeType.java | 2 +-
11 files changed, 139 insertions(+), 59 deletions(-)
diff --git a/antora/supplemental-ui/schema/chg/chg.xsd b/antora/supplemental-ui/schema/chg/chg-2.0.xsd
similarity index 96%
copy from antora/supplemental-ui/schema/chg/chg.xsd
copy to antora/supplemental-ui/schema/chg/chg-2.0.xsd
index cb55449..3590d20 100644
--- a/antora/supplemental-ui/schema/chg/chg.xsd
+++ b/antora/supplemental-ui/schema/chg/chg-2.0.xsd
@@ -24,22 +24,22 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
<xs:element name="changesDto">
<xs:annotation>
- <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>Represents v2.0 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>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/antora/supplemental-ui/schema/chg/chg.xsd b/antora/supplemental-ui/schema/chg/chg.xsd
index cb55449..3590d20 100644
--- a/antora/supplemental-ui/schema/chg/chg.xsd
+++ b/antora/supplemental-ui/schema/chg/chg.xsd
@@ -24,22 +24,22 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
<xs:element name="changesDto">
<xs:annotation>
- <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>Represents v2.0 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>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/antora/supplemental-ui/schema/cmd/cmd.xsd b/antora/supplemental-ui/schema/cmd/cmd-2.0.xsd
similarity index 92%
copy from antora/supplemental-ui/schema/cmd/cmd.xsd
copy to antora/supplemental-ui/schema/cmd/cmd-2.0.xsd
index 3ff2e90..87dcd6a 100644
--- a/antora/supplemental-ui/schema/cmd/cmd.xsd
+++ b/antora/supplemental-ui/schema/cmd/cmd-2.0.xsd
@@ -23,7 +23,7 @@
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.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
<xs:element name="commandsDto">
<xs:annotation>
@@ -38,18 +38,18 @@
<xs:element name="commandDto">
<xs:annotation>
- <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>Represents v2.0 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>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="4">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -61,6 +61,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The timestamp when this command was created, used for sequencing when replaying. This field is optional because it was introduced in v1.4. The framework-provided ContentMappingServiceForCommandDto populates this field dynamically whenever querying for commands through the REST API.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="user" type="xs:string">
<xs:annotation>
<xs:documentation>The name of the user that initiated/created this command.
diff --git a/antora/supplemental-ui/schema/cmd/cmd.xsd b/antora/supplemental-ui/schema/cmd/cmd.xsd
index 3ff2e90..87dcd6a 100644
--- a/antora/supplemental-ui/schema/cmd/cmd.xsd
+++ b/antora/supplemental-ui/schema/cmd/cmd.xsd
@@ -23,7 +23,7 @@
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.1.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
<xs:element name="commandsDto">
<xs:annotation>
@@ -38,18 +38,18 @@
<xs:element name="commandDto">
<xs:annotation>
- <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>Represents v2.0 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>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="4">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -61,6 +61,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The timestamp when this command was created, used for sequencing when replaying. This field is optional because it was introduced in v1.4. The framework-provided ContentMappingServiceForCommandDto populates this field dynamically whenever querying for commands through the REST API.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="user" type="xs:string">
<xs:annotation>
<xs:documentation>The name of the user that initiated/created this command.
diff --git a/antora/supplemental-ui/schema/common/common.xsd b/antora/supplemental-ui/schema/common/common-2.0.xsd
similarity index 80%
copy from antora/supplemental-ui/schema/common/common.xsd
copy to antora/supplemental-ui/schema/common/common-2.0.xsd
index ab26815..d36a0ba 100644
--- a/antora/supplemental-ui/schema/common/common.xsd
+++ b/antora/supplemental-ui/schema/common/common-2.0.xsd
@@ -35,14 +35,25 @@
<xs:element name="char" type="xs:string"/>
<xs:element name="bigInteger" type="xs:integer"/>
<xs:element name="bigDecimal" type="xs:decimal"/>
- <xs:element name="dateTime" type="xs:dateTime"/>
+ <!-- java.time -->
<xs:element name="localDate" type="xs:date"/>
<xs:element name="localDateTime" type="xs:dateTime"/>
<xs:element name="localTime" type="xs:time"/>
+ <xs:element name="offsetTime" type="xs:time"/>
+ <xs:element name="offsetDateTime" type="xs:dateTime"/>
+ <xs:element name="zonedDateTime" type="xs:dateTime"/>
+ <!-- joda -->
+ <xs:element name="jodaDateTime" type="xs:dateTime"/>
+ <xs:element name="jodaLocalDate" type="xs:date"/>
+ <xs:element name="jodaLocalTime" type="xs:time"/>
+ <xs:element name="jodaLocalDateTime" type="xs:dateTime"/>
+ <!-- -->
<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:element name="blob" type="blobDto"/>
+ <xs:element name="clob" type="clobDto"/>
</xs:choice>
</xs:complexType>
@@ -58,12 +69,7 @@
<xs:documentation>Deprecated, use the 'id' attribute instead.</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:sequence>
- <xs:attribute name="objectState" type="bookmarkObjectState">
- <xs:annotation>
- <xs:documentation>In previous versions of this schema the 'objectState' attribute was defaulted, but is now assumed to be 'persistent'</xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ </xs:sequence>
<xs:attribute name="type" type="xs:string"/>
<xs:attribute name="id" type="xs:string"/>
</xs:complexType>
@@ -80,6 +86,30 @@
<xs:attribute name="null" use="optional" type="xs:boolean"/>
</xs:complexType>
+ <xs:complexType name="blobDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="mimeType" type="xs:string"/>
+ <xs:element name="bytes" type="xs:hexBinary"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="clobDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="mimeType" type="xs:string"/>
+ <xs:element name="chars" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="oidsDto">
<xs:annotation>
<xs:documentation>A list of OIDs
@@ -97,13 +127,6 @@
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="bookmarkObjectState">
- <xs:restriction base="xs:string">
- <xs:enumeration value="persistent"/>
- <xs:enumeration value="transient"/>
- <xs:enumeration value="viewModel"/>
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="valueType">
<xs:restriction base="xs:string">
@@ -119,13 +142,24 @@
<xs:enumeration value="bigInteger"/>
<xs:enumeration value="bigDecimal"/>
<xs:enumeration value="javaSqlTimestamp"/>
+ <!-- java.time -->
+ <xs:enumeration value="localDateTime"/>
+ <xs:enumeration value="localDate"/>
+ <xs:enumeration value="localTime"/>
+ <xs:enumeration value="offsetDateTime"/>
+ <xs:enumeration value="offsetTime"/>
+ <xs:enumeration value="zonedDateTime"/>
+ <!-- joda -->
<xs:enumeration value="jodaDateTime"/>
<xs:enumeration value="jodaLocalDate"/>
<xs:enumeration value="jodaLocalTime"/>
<xs:enumeration value="jodaLocalDateTime"/>
+ <!-- -->
<xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
<xs:enumeration value="collection"/>
+ <xs:enumeration value="blob"/>
+ <xs:enumeration value="clob"/>
<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.
diff --git a/antora/supplemental-ui/schema/common/common.xsd b/antora/supplemental-ui/schema/common/common.xsd
index ab26815..d36a0ba 100644
--- a/antora/supplemental-ui/schema/common/common.xsd
+++ b/antora/supplemental-ui/schema/common/common.xsd
@@ -35,14 +35,25 @@
<xs:element name="char" type="xs:string"/>
<xs:element name="bigInteger" type="xs:integer"/>
<xs:element name="bigDecimal" type="xs:decimal"/>
- <xs:element name="dateTime" type="xs:dateTime"/>
+ <!-- java.time -->
<xs:element name="localDate" type="xs:date"/>
<xs:element name="localDateTime" type="xs:dateTime"/>
<xs:element name="localTime" type="xs:time"/>
+ <xs:element name="offsetTime" type="xs:time"/>
+ <xs:element name="offsetDateTime" type="xs:dateTime"/>
+ <xs:element name="zonedDateTime" type="xs:dateTime"/>
+ <!-- joda -->
+ <xs:element name="jodaDateTime" type="xs:dateTime"/>
+ <xs:element name="jodaLocalDate" type="xs:date"/>
+ <xs:element name="jodaLocalTime" type="xs:time"/>
+ <xs:element name="jodaLocalDateTime" type="xs:dateTime"/>
+ <!-- -->
<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:element name="blob" type="blobDto"/>
+ <xs:element name="clob" type="clobDto"/>
</xs:choice>
</xs:complexType>
@@ -58,12 +69,7 @@
<xs:documentation>Deprecated, use the 'id' attribute instead.</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:sequence>
- <xs:attribute name="objectState" type="bookmarkObjectState">
- <xs:annotation>
- <xs:documentation>In previous versions of this schema the 'objectState' attribute was defaulted, but is now assumed to be 'persistent'</xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ </xs:sequence>
<xs:attribute name="type" type="xs:string"/>
<xs:attribute name="id" type="xs:string"/>
</xs:complexType>
@@ -80,6 +86,30 @@
<xs:attribute name="null" use="optional" type="xs:boolean"/>
</xs:complexType>
+ <xs:complexType name="blobDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="mimeType" type="xs:string"/>
+ <xs:element name="bytes" type="xs:hexBinary"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="clobDto">
+ <xs:annotation>
+ <xs:documentation>A collection of (argument) values
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="mimeType" type="xs:string"/>
+ <xs:element name="chars" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="oidsDto">
<xs:annotation>
<xs:documentation>A list of OIDs
@@ -97,13 +127,6 @@
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="bookmarkObjectState">
- <xs:restriction base="xs:string">
- <xs:enumeration value="persistent"/>
- <xs:enumeration value="transient"/>
- <xs:enumeration value="viewModel"/>
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="valueType">
<xs:restriction base="xs:string">
@@ -119,13 +142,24 @@
<xs:enumeration value="bigInteger"/>
<xs:enumeration value="bigDecimal"/>
<xs:enumeration value="javaSqlTimestamp"/>
+ <!-- java.time -->
+ <xs:enumeration value="localDateTime"/>
+ <xs:enumeration value="localDate"/>
+ <xs:enumeration value="localTime"/>
+ <xs:enumeration value="offsetDateTime"/>
+ <xs:enumeration value="offsetTime"/>
+ <xs:enumeration value="zonedDateTime"/>
+ <!-- joda -->
<xs:enumeration value="jodaDateTime"/>
<xs:enumeration value="jodaLocalDate"/>
<xs:enumeration value="jodaLocalTime"/>
<xs:enumeration value="jodaLocalDateTime"/>
+ <!-- -->
<xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
<xs:enumeration value="collection"/>
+ <xs:enumeration value="blob"/>
+ <xs:enumeration value="clob"/>
<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.
diff --git a/antora/supplemental-ui/schema/ixn/ixn.xsd b/antora/supplemental-ui/schema/ixn/ixn-2.0.xsd
similarity index 96%
copy from antora/supplemental-ui/schema/ixn/ixn.xsd
copy to antora/supplemental-ui/schema/ixn/ixn-2.0.xsd
index 63380a8..002a3b3 100644
--- a/antora/supplemental-ui/schema/ixn/ixn.xsd
+++ b/antora/supplemental-ui/schema/ixn/ixn-2.0.xsd
@@ -25,23 +25,23 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <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:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-2.0.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <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>Represents v2.0 of this schema (as per majorVersion.minorVersion @default attribute, below); just updates to use cmd v1.4 schema.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="3">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -103,7 +103,7 @@
</xs:element>
<xs:element name="metrics" type="metricsDto">
<xs:annotation>
- <xs:documentation>Profiling metrics capturng the this time/number of objects affected as a result of performing this member interaction (invoke the action, or edit the property).
+ <xs:documentation>Profiling metrics capturing the this time/number of objects affected as a result of performing this member interaction (invoke the action, or edit the property).
</xs:documentation>
</xs:annotation>
</xs:element>
diff --git a/antora/supplemental-ui/schema/ixn/ixn.xsd b/antora/supplemental-ui/schema/ixn/ixn.xsd
index 63380a8..002a3b3 100644
--- a/antora/supplemental-ui/schema/ixn/ixn.xsd
+++ b/antora/supplemental-ui/schema/ixn/ixn.xsd
@@ -25,23 +25,23 @@
xmlns:com="http://isis.apache.org/schema/common"
>
- <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:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-2.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-2.0.xsd"/>
<xs:element name="interactionDto">
<xs:annotation>
- <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>Represents v2.0 of this schema (as per majorVersion.minorVersion @default attribute, below); just updates to use cmd v1.4 schema.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="3">
+ <xs:element name="minorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="0">
<xs:annotation>
<xs:documentation>The minor version of the schema that an XML instance was created using.
</xs:documentation>
@@ -103,7 +103,7 @@
</xs:element>
<xs:element name="metrics" type="metricsDto">
<xs:annotation>
- <xs:documentation>Profiling metrics capturng the this time/number of objects affected as a result of performing this member interaction (invoke the action, or edit the property).
+ <xs:documentation>Profiling metrics capturing the this time/number of objects affected as a result of performing this member interaction (invoke the action, or edit the property).
</xs:documentation>
</xs:annotation>
</xs:element>
diff --git a/antora/supplemental-ui/schema/metamodel/metamodel.xsd b/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
similarity index 99%
copy from antora/supplemental-ui/schema/metamodel/metamodel.xsd
copy to antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
index d1cee4b..cdc76ab 100644
--- a/antora/supplemental-ui/schema/metamodel/metamodel.xsd
+++ b/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
@@ -40,7 +40,7 @@
<xs:complexContent>
<xs:extension base="facetHolder">
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/antora/supplemental-ui/schema/metamodel/metamodel.xsd b/antora/supplemental-ui/schema/metamodel/metamodel.xsd
index d1cee4b..cdc76ab 100644
--- a/antora/supplemental-ui/schema/metamodel/metamodel.xsd
+++ b/antora/supplemental-ui/schema/metamodel/metamodel.xsd
@@ -40,7 +40,7 @@
<xs:complexContent>
<xs:extension base="facetHolder">
<xs:sequence>
- <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="2">
<xs:annotation>
<xs:documentation>The major version of the schema that an XML instance was created using.
</xs:documentation>
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
index 35ab297..796dc7e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
@@ -93,7 +93,7 @@ public interface NamedWithMimeType extends Serializable {
TIFF("image/tiff", "tif"),
TS("video/mp2t"),
TTF("font/ttf"),
- TXT("text/plain"),
+ TXT("text/plain"), /*aliases*/ LOG("text/plain"), PROPERTIES("text/plain"),
VSD("application/vnd.visio"),
WAV("audio/wav"),
WEBA("audio/webm"),