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/02/13 13:48:29 UTC
[02/19] isis-site git commit: publishes 1.16.1-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/migration-notes/migration-notes.html b/content/versions/SNAPSHOT/migration-notes/migration-notes.html
index 982c193..c2ec72f 100644
--- a/content/versions/SNAPSHOT/migration-notes/migration-notes.html
+++ b/content/versions/SNAPSHOT/migration-notes/migration-notes.html
@@ -527,7 +527,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>As described <a href="../guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_replacing-default-service-implementations">here</a>, it is possible to override framework services so that the framework uses the replacement implementation. Previously this required explicitly setting either <a href="../guides/rgant/rgant.html#_rgant_DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>.</p>
+ <p>As described <a href="../guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_replacing-default-service-implementations">here</a>, it is possible to override framework services so that the framework uses the replacement implementation. Previously this required explicitly setting either <a href="../guides/rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> or <a href="../guides/rgant/rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>.</p>
</div>
<div class="paragraph">
<p>In 1.15.0, the default value for <code>menuOrder</code> has been set to a value lower than that of the framework-provided implementations, and so will a custom implementation will always take precedence over the framework implementations without having to remember to also set <code>menuOrder</code>.</p>
@@ -819,10 +819,10 @@ log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
<p>There can be more than one implementation of this new SPI, and a framework-provided implementation (<code>PublisherServiceLogging</code>) will log to a file. The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module also implements the new SPI.</p>
</div>
<div class="paragraph">
- <p>The new service also supports the notion of published property edits; the new <a href="../guides/rgant/rgant.html#_rgant_Property_publishing"><code>@Property#publishing()</code></a> annotation attribute can be used to specify. The ` isis.services.publish.properties` configuration property can be used to specify a fallback default for properties where the attribute is not set explicitly.</p>
+ <p>The new service also supports the notion of published property edits; the new <a href="../guides/rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation attribute can be used to specify. The ` isis.services.publish.properties` configuration property can be used to specify a fallback default for properties where the attribute is not set explicitly.</p>
</div>
<div class="paragraph">
- <p>Conversely, neither the <a href="../guides/rgant/rgant.html#_rgant_Action_publishingPayloadFactory"><code>@Action#publishingPayloadFactory()</code></a> nor the <a href="../guides/rgant/rgant.html#_rgant_DomainObject_publishingPayloadFactory"><code>@DomainObject#publishingPayloadFactory()</code></a> are supported by <code>PublisherService</code>; instead the consumers of the events are expected to callback for any additional information, eg using <a href="../guides/ugvro/ugvro.html">Resful Objects</a> viewer.</p>
+ <p>Conversely, neither the <a href="../guides/rgant/rgant.html#_rgant-Action_publishingPayloadFactory"><code>@Action#publishingPayloadFactory()</code></a> nor the <a href="../guides/rgant/rgant.html#_rgant-DomainObject_publishingPayloadFactory"><code>@DomainObject#publishingPayloadFactory()</code></a> are supported by <code>PublisherService</code>; instead the consumers of the events are expected to callback for any additional information, eg using <a href="../guides/ugvro/ugvro.html">Resful Objects</a> viewer.</p>
</div>
</div>
<div class="sect2">
@@ -977,7 +977,7 @@ log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
<ul>
<li> <p><code>@Nullable</code> annotation<br></p>
<div class="paragraph">
- <p>The <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> annotation can now be used to specify the optionality of properties and parameters.</p>
+ <p>The <a href="../guides/rgant/rgant.html#_rgant-Nullable"><code>@Nullable</code></a> annotation can now be used to specify the optionality of properties and parameters.</p>
</div> </li>
<li> <p><code>ActionDomainEvent</code> for mixins<br></p>
<div class="paragraph">
@@ -985,7 +985,7 @@ log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
</div> </li>
<li> <p><code>Blob</code> and <code>Clob</code> file types<br></p>
<div class="paragraph">
- <p>The <a href="../guides/rgant/rgant.html#_rgant_Property_fileAccept"><code>@Property#fileAccept()</code></a> and <a href="../guides/rgant/rgant.html#_rgant_Parameter_fileAccept"><code>@Parameter#fileAccept()</code></a> annotation attributes can be used to hint at the file type to upload for a blob or clob.</p>
+ <p>The <a href="../guides/rgant/rgant.html#_rgant-Property_fileAccept"><code>@Property#fileAccept()</code></a> and <a href="../guides/rgant/rgant.html#_rgant-Parameter-fileAccept"><code>@Parameter#fileAccept()</code></a> annotation attributes can be used to hint at the file type to upload for a blob or clob.</p>
</div> </li>
<li> <p>Live reloading<br></p>
<div class="paragraph">
@@ -1069,7 +1069,7 @@ log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
<p>The <code>DomainObjectContainer</code> service will continue to be supported until Apache Isis v2.0.0, but in the meantime, consider changing existing application code to use these new domain services.</p>
</div>
<div class="paragraph">
- <p>Please note that when migrating from _rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persist()</code>] to <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a>, no exception will be thrown if the Domain Object is already persisted, so the behavior of <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a> will be the same as that of <a href="rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer#persistIfNotAlready()</code></a>.</p>
+ <p>Please note that when migrating from _rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persist()</code>] to <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a>, no exception will be thrown if the Domain Object is already persisted, so the behavior of <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a> will be the same as that of <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer#persistIfNotAlready()</code></a>.</p>
</div>
</div>
<div class="sect2">
@@ -1180,7 +1180,7 @@ log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
<p>The new <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService"><code>RoutingService</code></a> SPI service provides a plugin point to the <a href="../guides/ugvw/ugvw.html">Wicket viewer</a> so that a different object than that returned from an action invocation can be rendered.</p>
</div>
<div class="paragraph">
- <p>The framework provides a default implementation of this service that will - instead of a void or a <code>null</code> result - render the home page (as per the <a href="../guides/rgant/rgant.html#_rgant_HomePage"><code>@HomePage</code></a> annotation) if there is one. This is therefore a subtle change in the UI. If you wish to retain the original behaviour (to return the "no results" page instead), then you should implement your own no-op implementation of this service:</p>
+ <p>The framework provides a default implementation of this service that will - instead of a void or a <code>null</code> result - render the home page (as per the <a href="../guides/rgant/rgant.html#_rgant-HomePage"><code>@HomePage</code></a> annotation) if there is one. This is therefore a subtle change in the UI. If you wish to retain the original behaviour (to return the "no results" page instead), then you should implement your own no-op implementation of this service:</p>
</div>
<div class="listingblock">
<div class="content">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/release-notes/release-notes.html b/content/versions/SNAPSHOT/release-notes/release-notes.html
index 9a88be1..79f74e8 100644
--- a/content/versions/SNAPSHOT/release-notes/release-notes.html
+++ b/content/versions/SNAPSHOT/release-notes/release-notes.html
@@ -307,6 +307,25 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.1">1.16.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">xx-02-2018</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Parented collections with checkboxes, replay module</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">.</p></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">.</p></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">.</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>…</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.0">1.16.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-01-2018</p></td>
<td class="tableblock halign-left valign-top">
@@ -920,6 +939,39 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect1">
+ <h2 id="_release-notes_1.16.1">1.16.1</h2>
+ <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
+ <button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
+ <ul class="dropdown-menu">
+ <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
+ <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
+ <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
+ <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
+ </ul>
+ </div>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>This release is primarily a bug fix release, but does introduce a couple of notable new features and improvements:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1585">ISIS-1585</a> supports checkboxes on parented (rather than standalone) collections. The selected items are used as the default values for any associated actions with collection parameters.</p>
+ <div class="paragraph">
+ <p>As part of this change, the new <code>@Action(associateWith="…")</code> attribute can be used instead of <code>@MemberOrder(…)</code> as a way to associate actions with either collections or properties.</p>
+ </div> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1569">ISIS-1569</a> provides infrastructure to enable commands to be replayed from master to slave (for regression testing purposes).</p>
+ <div class="paragraph">
+ <p>The majority of the implementation is provided in the (non-ASF) (non-ASF) <a href="http://platform.incode.org">Incode Platform</a>'s new <a href="http://platform.incode.org/modules/spi/command/spi-command-replay.html">command replay</a> library.</p>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Applications written against v1.16.0 should run against v1.16.1 with few if any changes.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
<h2 id="_release-notes_1.16.0">1.16.0</h2>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.0.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/chg/chg-1.1.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/chg/chg-1.1.xsd b/content/versions/SNAPSHOT/schema/chg/chg-1.1.xsd
new file mode 100644
index 0000000..cb55449
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/chg/chg-1.1.xsd
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/chg"
+ elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://isis.apache.org/schema/chg"
+ xmlns:com="http://isis.apache.org/schema/common"
+>
+
+ <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="../common/common-1.1.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>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <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:annotation>
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transactionId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Unique identifier of the interaction id within which this change occurred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sequence" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>Unique sequence number of the set of change within the interaction. There could be many such events within a single interaction, one for each completed transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="completedAt" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The point in time that these changes were completed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="user" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of the user that performed this transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="objects" type="objectsDto"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="objectsDto">
+ <xs:annotation>
+ <xs:documentation>A set of changes to domain objects.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="loaded" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>The number of objects loaded within the transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="created" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>The list of objects created within the transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="updated" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>The list of objects updated within the transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="deleted" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>The list of objects deleted within the transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="propertiesModified" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>The number of object properties modified within the transaction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/chg/chg.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/chg/chg.xsd b/content/versions/SNAPSHOT/schema/chg/chg.xsd
index 41501de..cb55449 100644
--- a/content/versions/SNAPSHOT/schema/chg/chg.xsd
+++ b/content/versions/SNAPSHOT/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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/cmd/cmd-1.2.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/cmd/cmd-1.2.xsd b/content/versions/SNAPSHOT/schema/cmd/cmd-1.2.xsd
new file mode 100644
index 0000000..8073266
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/cmd/cmd-1.2.xsd
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/cmd"
+ elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ 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:element name="commandDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.2 of this schema.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <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="2">
+ <xs:annotation>
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transactionId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Transaction id for this command, a unique identifier.
+ </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.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="targets" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>For regular actions, represents the entity/entities or view model(s) upon which the action is to be invoked. For mixin actions, is the object(s) 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). Note that this means that bulk contributed actions cannot be reified as a memento (for this use case, implement as a mixin action instead).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="member" type="memberDto">
+ <xs:annotation>
+ <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:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="memberDto" abstract="true">
+ <xs:annotation>
+ <xs:documentation>Represents the information required to be able to invoke an action or modify a property on the target(s). Specifically, is the identifier of the action/property, along with the parameter arguments. Is subclassed by 'actionDto' and 'propertyDto'.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="memberIdentifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Formal identifier of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="interactionType" type="com:interactionType">
+ <xs:annotation>
+ <xs:documentation>Indicates whether this is an intention to invoke an action, or edit a property.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="actionDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to invoke an action on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="parameters" type="paramsDto">
+ <xs:annotation>
+ <xs:documentation>The list of parameter/argument values for this action invocation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="propertyDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to modify a property on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="newValue" type="com:valueWithTypeDto"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="paramsDto">
+ <xs:annotation>
+ <xs:documentation>A list of of parameter/argument values.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="parameter" type="paramDto"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="paramDto">
+ <xs:annotation>
+ <xs:documentation>Defines an action parameter: its name, type and value (ie provided argument).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="com:valueWithTypeDto">
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/cmd/cmd-1.3.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/cmd/cmd-1.3.xsd b/content/versions/SNAPSHOT/schema/cmd/cmd-1.3.xsd
new file mode 100644
index 0000000..6f14ad1
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/cmd/cmd-1.3.xsd
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/cmd"
+ elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ 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:element name="commandDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.3 of this schema, adding in 'logicalMemberIdentifier'
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <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="3">
+ <xs:annotation>
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transactionId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Transaction id for this command, a unique identifier.
+ </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.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="targets" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>For regular actions, represents the entity/entities or view model(s) upon which the action is to be invoked. For mixin actions, is the object(s) 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). Note that this means that bulk contributed actions cannot be reified as a memento (for this use case, implement as a mixin action instead).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="member" type="memberDto">
+ <xs:annotation>
+ <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:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="memberDto" abstract="true">
+ <xs:annotation>
+ <xs:documentation>Represents the information required to be able to invoke an action or modify a property on the target(s). Specifically, is the identifier of the action/property, along with the parameter arguments. Is subclassed by 'actionDto' and 'propertyDto'.
+ </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 (class name and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="interactionType" type="com:interactionType">
+ <xs:annotation>
+ <xs:documentation>Indicates whether this is an intention to invoke an action, or edit a property.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="actionDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to invoke an action on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="parameters" type="paramsDto">
+ <xs:annotation>
+ <xs:documentation>The list of parameter/argument values for this action invocation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="propertyDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to modify a property on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="newValue" type="com:valueWithTypeDto"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="paramsDto">
+ <xs:annotation>
+ <xs:documentation>A list of of parameter/argument values.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="parameter" type="paramDto"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="paramDto">
+ <xs:annotation>
+ <xs:documentation>Defines an action parameter: its name, type and value (ie provided argument).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="com:valueWithTypeDto">
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/cmd/cmd-1.4.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/cmd/cmd-1.4.xsd b/content/versions/SNAPSHOT/schema/cmd/cmd-1.4.xsd
new file mode 100644
index 0000000..3ff2e90
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/cmd/cmd-1.4.xsd
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/cmd"
+ elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ 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: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.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>
+ <xs:sequence>
+ <xs:element name="majorVersion" type="xs:string" minOccurs="1" maxOccurs="1" default="1">
+ <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:annotation>
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transactionId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Transaction id for this command, a unique identifier.
+ </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.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="targets" type="com:oidsDto">
+ <xs:annotation>
+ <xs:documentation>For regular actions, represents the entity/entities or view model(s) upon which the action is to be invoked. For mixin actions, is the object(s) 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). Note that this means that bulk contributed actions cannot be reified as a memento (for this use case, implement as a mixin action instead).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="member" type="memberDto">
+ <xs:annotation>
+ <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>
+
+ <xs:complexType name="memberDto" abstract="true">
+ <xs:annotation>
+ <xs:documentation>Represents the information required to be able to invoke an action or modify a property on the target(s). Specifically, is the identifier of the action/property, along with the parameter arguments. Is subclassed by 'actionDto' and 'propertyDto'.
+ </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 (class name and member name) of the member being interacted with (action or property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="interactionType" type="com:interactionType">
+ <xs:annotation>
+ <xs:documentation>Indicates whether this is an intention to invoke an action, or edit a property.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="actionDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to invoke an action on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="parameters" type="paramsDto">
+ <xs:annotation>
+ <xs:documentation>The list of parameter/argument values for this action invocation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="propertyDto">
+ <xs:annotation>
+ <xs:documentation>Captures the information required to be able to modify a property on the target(s).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="memberDto">
+ <xs:sequence>
+ <xs:element name="newValue" type="com:valueWithTypeDto"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="paramsDto">
+ <xs:annotation>
+ <xs:documentation>A list of of parameter/argument values.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="parameter" type="paramDto"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="paramDto">
+ <xs:annotation>
+ <xs:documentation>Defines an action parameter: its name, type and value (ie provided argument).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="com:valueWithTypeDto">
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ </xs:extension>
+ </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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/cmd/cmd.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/cmd/cmd.xsd b/content/versions/SNAPSHOT/schema/cmd/cmd.xsd
index e3aa0b9..3ff2e90 100644
--- a/content/versions/SNAPSHOT/schema/cmd/cmd.xsd
+++ b/content/versions/SNAPSHOT/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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/common/common-1.1.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/common/common-1.1.xsd b/content/versions/SNAPSHOT/schema/common/common-1.1.xsd
new file mode 100644
index 0000000..ab26815
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/common/common-1.1.xsd
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/common"
+ elementFormDefault="qualified"
+ xmlns="http://isis.apache.org/schema/common"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:complexType name="valueDto">
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="string" type="xs:string"/>
+ <xs:element name="byte" type="xs:byte"/>
+ <xs:element name="short" type="xs:short"/>
+ <xs:element name="int" type="xs:int"/>
+ <xs:element name="long" type="xs:long"/>
+ <xs:element name="float" type="xs:float"/>
+ <xs:element name="double" type="xs:double"/>
+ <xs:element name="boolean" type="xs:boolean"/>
+ <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"/>
+ <xs:element name="localDate" type="xs:date"/>
+ <xs:element name="localDateTime" type="xs:dateTime"/>
+ <xs:element name="localTime" type="xs:time"/>
+ <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>
+
+ <xs:complexType name="oidDto">
+ <xs:sequence>
+ <xs:element name="objectType" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Deprecated, use the 'objectType' attribute instead.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="objectIdentifier" type="xs:string">
+ <xs:annotation>
+ <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:attribute name="type" type="xs:string"/>
+ <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
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="oid" type="oidDto" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="enumDto">
+ <xs:sequence>
+ <xs:element name="enumType" type="xs:string"/>
+ <xs:element name="enumName" type="xs:string"/>
+ </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">
+ <xs:enumeration value="string"/>
+ <xs:enumeration value="byte"/>
+ <xs:enumeration value="short"/>
+ <xs:enumeration value="int"/>
+ <xs:enumeration value="long"/>
+ <xs:enumeration value="float"/>
+ <xs:enumeration value="double"/>
+ <xs:enumeration value="boolean"/>
+ <xs:enumeration value="char"/>
+ <xs:enumeration value="bigInteger"/>
+ <xs:enumeration value="bigDecimal"/>
+ <xs:enumeration value="javaSqlTimestamp"/>
+ <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="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>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="periodDto">
+ <xs:annotation>
+ <xs:documentation>Captures a period of time, eg for capturing metrics/timings.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="startedAt" type="xs:dateTime">
+ <xs:annotation>
+ <xs:documentation>The point in time that this period of time started.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="completedAt" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The point in time that this period of time completed. The duration is the difference between 'start' and 'complete'.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="differenceDto">
+ <xs:annotation>
+ <xs:documentation>Captures a pair of numbers representing a difference. Used for example to capture metrics (number objects modified before and after).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ </xs:sequence>
+ <xs:attribute name="before" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>The initial quantity.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="after" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>The final quantity, once known. The difference is therefore the computation of (after - before).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="valueWithTypeDto">
+ <xs:annotation>
+ <xs:documentation>Captures both a value and its corresponding type. Used for the return value of action invocations, and for the new value in property edits.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="valueDto">
+ <xs:attribute name="type" use="required" type="valueType"/>
+ <xs:attribute name="null" use="optional" type="xs:boolean"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+ <xs:simpleType name="interactionType" >
+ <xs:annotation>
+ <xs:documentation>Whether this interaction with a member is invoking an action, or editing a property.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="action_invocation" />
+ <xs:enumeration value="property_edit" />
+ </xs:restriction>
+ </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/common/common.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/common/common.xsd b/content/versions/SNAPSHOT/schema/common/common.xsd
index 041208c..ab26815 100644
--- a/content/versions/SNAPSHOT/schema/common/common.xsd
+++ b/content/versions/SNAPSHOT/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
http://git-wip-us.apache.org/repos/asf/isis-site/blob/f27adae8/content/versions/SNAPSHOT/schema/ixn/ixn-1.1.xsd
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/schema/ixn/ixn-1.1.xsd b/content/versions/SNAPSHOT/schema/ixn/ixn-1.1.xsd
new file mode 100644
index 0000000..e8ccfe5
--- /dev/null
+++ b/content/versions/SNAPSHOT/schema/ixn/ixn-1.1.xsd
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="http://isis.apache.org/schema/ixn"
+ elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://isis.apache.org/schema/ixn"
+ xmlns:cmd="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/cmd" schemaLocation="../cmd/cmd-1.2.xsd"/>
+
+ <xs:element name="interactionDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.1 of this schema. This schema replaces and generalizes the earlier 'actionInvocationMemento'.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="majorVersion" type="xs:string" minOccurs="0" maxOccurs="1" default="1">
+ <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:annotation>
+ <xs:documentation>The minor version of the schema that an XML instance was created using.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transactionId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Unique identifier of the interaction which this member was interacted with (action invoked/property edited); can be used to locate the corresponding Command object (which may have been persisted).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="execution" type="memberExecutionDto"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ </xs:element>
+
+ <xs:complexType name="memberExecutionDto" abstract="true">
+ <xs:annotation>
+ <xs:documentation>Represents either an action invocation or a property edit. Is subclassed by both.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="sequence" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>Unique sequence number of an individual member interaction within the overall interaction. There could be many such member interactions (within a single transaction) for two reasons: either a single top-level interaction could call sub-interactions (by virtue of WrapperFactory), or there may be a bulk action interaction against many targets.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="target" type="com:oidDto">
+ <xs:annotation>
+ <xs:documentation>For target domain object being interacted with. For regular actions/properties, represents the entity or view model upon which the action is to be invoked/property edited. For mixin actions/properties, is the object being mixed-into (the constructor arg to the mixin). For contributed actions/properties, is the domain service (the contributee object will be one of the action arguments within the payload).
+ </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).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="user" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The name of the user that invoked this action. Note that this isn't necessarily the user that initiated the original command; the SudoService may be being used to temporarily switch the effective user.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="title" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>User-friendly title of the 'target' object.
+ </xs:documentation>
+ </xs:annotation>
+ </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>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="threw" type="exceptionDto" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Captures any exception thrown by an action. Either the 'returned' or the 'threw' element will be populated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="childExecutions" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="execution" type="memberExecutionDto" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Capture interactions with other members from this interaction, using the WrapperFactory service. Typically this will be actions invoking other actions, but it is also possible for an action to perform a property edit, and - much rarer - for a property edit to invoke an action. Whatever; these interactions nest together into a call/stack, more generally into a graph.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="interactionType" type="com:interactionType">
+ <xs:annotation>
+ <xs:documentation>Indicates whether this is an intention to invoke an action, or edit a property.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="actionInvocationDto">
+ <xs:complexContent>
+ <xs:extension base="memberExecutionDto">
+ <xs:sequence>
+ <xs:element name="parameters" type="cmd:paramsDto">
+ <xs:annotation>
+ <xs:documentation>The list of parameter/argument values for this action invocation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="returned" type="com:valueWithTypeDto" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The value returned by this action (including the type of that returned value). Either the 'returned' or the 'threw' element (from 'memberExecutionDto') will be populated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="propertyEditDto">
+ <xs:complexContent>
+ <xs:extension base="memberExecutionDto">
+ <xs:sequence>
+ <xs:element name="newValue" type="com:valueWithTypeDto"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="metricsDto">
+ <xs:sequence>
+ <xs:element name="timings" type="com:periodDto">
+ <xs:annotation>
+ <xs:documentation>The time taken to perform the member interaction (invoke the action, or edit the property).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="objectCounts" type="objectCountsDto">
+ <xs:annotation>
+ <xs:documentation>How many objets were affected by the member interaction.
+ </xs:documentation>
+ </xs:annotation>
+
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="objectCountsDto">
+ <xs:sequence>
+ <xs:element name="loaded" type="com:differenceDto">
+ <xs:annotation>
+ <xs:documentation>The number of objects loaded.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="dirtied" type="com:differenceDto">
+ <xs:annotation>
+ <xs:documentation>The number of objects dirtied (ie updated).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+
+ </xs:complexType>
+
+ <xs:complexType name="exceptionDto">
+ <xs:annotation>
+ <xs:documentation>Captures any exception thrown by an action invocation. Use as the xsd:type of the 'threw' element.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="message" type="xs:string"/>
+ <xs:element name="stackTrace" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A formatted stack trace. (A future version of the 'exceptionDto' element might refine this to more easily parseable stack trace elements).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="causedBy" type="exceptionDto" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file