You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/05/14 13:44:10 UTC
[1/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Repository: isis-site
Updated Branches:
refs/heads/asf-site 4d591ceb3 -> 3eb5a1daf
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/common/common-1.0.xsd
----------------------------------------------------------------------
diff --git a/content/schema/common/common-1.0.xsd b/content/schema/common/common-1.0.xsd
index bb07ba6..041208c 100644
--- a/content/schema/common/common-1.0.xsd
+++ b/content/schema/common/common-1.0.xsd
@@ -33,22 +33,55 @@
<xs:element name="double" type="xs:double"/>
<xs:element name="boolean" type="xs:boolean"/>
<xs:element name="char" type="xs:string"/>
- <xs:element name="bigDecimal" type="xs:decimal"/>
<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:choice>
</xs:complexType>
<xs:complexType name="oidDto">
<xs:sequence>
- <xs:element name="objectType" type="xs:string"/>
- <xs:element name="objectIdentifier" type="xs:string"/>
+ <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="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:attribute name="objectState" type="bookmarkObjectState" default="persistent"/>
</xs:complexType>
<xs:simpleType name="bookmarkObjectState">
@@ -59,7 +92,6 @@
</xs:restriction>
</xs:simpleType>
-
<xs:simpleType name="valueType">
<xs:restriction base="xs:string">
<xs:enumeration value="string"/>
@@ -73,19 +105,87 @@
<xs:enumeration value="char"/>
<xs:enumeration value="bigInteger"/>
<xs:enumeration value="bigDecimal"/>
- <xs:enumeration value="javaUtilDate"/>
- <xs:enumeration value="javaSqlDate"/>
- <xs:enumeration value="javaSqlTime"/>
<xs:enumeration value="javaSqlTimestamp"/>
<xs:enumeration value="jodaDateTime"/>
<xs:enumeration value="jodaLocalDate"/>
<xs:enumeration value="jodaLocalTime"/>
<xs:enumeration value="jodaLocalDateTime"/>
- <xs:enumeration value="isisApplibBlob"/>
- <xs:enumeration value="isisApplibClob"/>
+ <xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
+ <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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/common/common.xsd
----------------------------------------------------------------------
diff --git a/content/schema/common/common.xsd b/content/schema/common/common.xsd
index bb07ba6..041208c 100644
--- a/content/schema/common/common.xsd
+++ b/content/schema/common/common.xsd
@@ -33,22 +33,55 @@
<xs:element name="double" type="xs:double"/>
<xs:element name="boolean" type="xs:boolean"/>
<xs:element name="char" type="xs:string"/>
- <xs:element name="bigDecimal" type="xs:decimal"/>
<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:choice>
</xs:complexType>
<xs:complexType name="oidDto">
<xs:sequence>
- <xs:element name="objectType" type="xs:string"/>
- <xs:element name="objectIdentifier" type="xs:string"/>
+ <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="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:attribute name="objectState" type="bookmarkObjectState" default="persistent"/>
</xs:complexType>
<xs:simpleType name="bookmarkObjectState">
@@ -59,7 +92,6 @@
</xs:restriction>
</xs:simpleType>
-
<xs:simpleType name="valueType">
<xs:restriction base="xs:string">
<xs:enumeration value="string"/>
@@ -73,19 +105,87 @@
<xs:enumeration value="char"/>
<xs:enumeration value="bigInteger"/>
<xs:enumeration value="bigDecimal"/>
- <xs:enumeration value="javaUtilDate"/>
- <xs:enumeration value="javaSqlDate"/>
- <xs:enumeration value="javaSqlTime"/>
<xs:enumeration value="javaSqlTimestamp"/>
<xs:enumeration value="jodaDateTime"/>
<xs:enumeration value="jodaLocalDate"/>
<xs:enumeration value="jodaLocalTime"/>
<xs:enumeration value="jodaLocalDateTime"/>
- <xs:enumeration value="isisApplibBlob"/>
- <xs:enumeration value="isisApplibClob"/>
+ <xs:enumeration value="enum"/>
<xs:enumeration value="reference"/>
+ <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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/ixn/ixn-1.0.xsd
----------------------------------------------------------------------
diff --git a/content/schema/ixn/ixn-1.0.xsd b/content/schema/ixn/ixn-1.0.xsd
new file mode 100644
index 0000000..a6d123a
--- /dev/null
+++ b/content/schema/ixn/ixn-1.0.xsd
@@ -0,0 +1,227 @@
+\ufeff<?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.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+
+ <xs:element name="interactionDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.0 of this schema, replacing and generalizing 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="0">
+ <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 within 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="id" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Unique identifier for this individual member interaction, in the format "transactionId.sequence" (where 'transactionId' is part of the owning 'memberInteractionMementoDto' and 'sequence' is defined below).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sequence" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>Unique sequence number of an individual member interaction within a transaction. 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" minOccurs="1" maxOccurs="1">
+ <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:element name="propertiesModified" type="com:differenceDto">
+ <xs:annotation>
+ <xs:documentation>The number of individual properties of objects that were modified (each such change would correspond to a separate call to AuditingService if configured).
+ </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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/ixn/ixn.xsd
----------------------------------------------------------------------
diff --git a/content/schema/ixn/ixn.xsd b/content/schema/ixn/ixn.xsd
new file mode 100644
index 0000000..a6d123a
--- /dev/null
+++ b/content/schema/ixn/ixn.xsd
@@ -0,0 +1,227 @@
+\ufeff<?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.0.xsd"/>
+ <xs:import namespace="http://isis.apache.org/schema/cmd" schemaLocation="../cmd/cmd-1.0.xsd"/>
+
+ <xs:element name="interactionDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.0 of this schema, replacing and generalizing 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="0">
+ <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 within 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="id" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Unique identifier for this individual member interaction, in the format "transactionId.sequence" (where 'transactionId' is part of the owning 'memberInteractionMementoDto' and 'sequence' is defined below).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sequence" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>Unique sequence number of an individual member interaction within a transaction. 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" minOccurs="1" maxOccurs="1">
+ <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:element name="propertiesModified" type="com:differenceDto">
+ <xs:annotation>
+ <xs:documentation>The number of individual properties of objects that were modified (each such change would correspond to a separate call to AuditingService if configured).
+ </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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/screencasts.html
----------------------------------------------------------------------
diff --git a/content/screencasts.html b/content/screencasts.html
index 49863ed..367edac 100644
--- a/content/screencasts.html
+++ b/content/screencasts.html
@@ -902,7 +902,7 @@ How the framework uses the <a href="rgcms.html#_rgcms_classes_AppManifest-bootst
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI" target="_blank">012</a><br>
-Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
+Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -922,7 +922,7 @@ Implementing business logic using a (no-arg) action, and associating with a prop
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0naoVsWppuQ" target="_blank">013</a><br>
-Invoking (no-arg) action on multiple objects at once (using <a href="rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
+Invoking (no-arg) action on multiple objects at once (using <a href="rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1002,7 +1002,7 @@ Using the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM" target="_blank">015</a><br>
-Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="rgant.html#_rgant_DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
+Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1164,7 +1164,7 @@ Demonstrates how the end-user can copy and share URLs for domain objects - inclu
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=a0QQLT_16To" target="_blank">021</a><br>
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="rgant.html#_rgant_DomainObjectLayout_bookmarking">domain objects</a> and (<a href="rgant.html#_rgant_Action_semantics">query-only</a>) <a href="rgant.html#_rgant_ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
+Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="rgant.html#_rgant-DomainObjectLayout_bookmarking">domain objects</a> and (<a href="rgant.html#_rgant-Action_semantics">query-only</a>) <a href="rgant.html#_rgant-ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1300,7 +1300,7 @@ Using a domain event <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=qj4bMkQRBUY" target="_blank">026</a><br>
-Using the <a href="rgant.html#_rgant_Title"><code>@Title</code></a> annotation (instead of the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
+Using the <a href="rgant.html#_rgant-Title"><code>@Title</code></a> annotation (instead of the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1325,7 +1325,7 @@ Using the <a href="rgant.html#_rgant_Title"><code>@Title</code></a> annotation (
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=yi52Gbd3lmY" target="_blank">027</a><br>
-How to write an <a href="ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="rgant.html#_rgant_Mixin">mixin</a>.</p>
+How to write an <a href="ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="rgant.html#_rgant-Mixin">mixin</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -1399,7 +1399,7 @@ Using <a href="https://projectlombok.org/">Project Lombok</a> to remove boilerpl
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0" target="_blank">029</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
+Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="rgant.html#_rgant-ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1477,7 +1477,7 @@ How to validate action parameters using a supporting <a href="rgcms.html#_rgcms_
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=1Vlzob89pYI" target="_blank">031</a><br>
-How to validate action parameters using the <a href="rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a> and the Specification interface.</p>
+How to validate action parameters using the <a href="rgant.html#_rgant-Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a> and the Specification interface.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1672,7 +1672,7 @@ How to use an enum for choices (drop down list) for both a property or an action
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=1SCyBlMM2Bo" target="_blank">037</a><br>
-How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
+How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="rgant.html#_rgant-PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1844,7 +1844,7 @@ Using BigDecimal as a property within a domain object, also demonstrating the "s
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=n9Oy0m2bplw" target="_blank">042</a><br>
-How to use the <a href="rgant.html#_rgant_Digits"><code>@Digits</code></a> annotation for action parameters of type <code>java.math.BigDecimal</code>.</p>
+How to use the <a href="rgant.html#_rgant-Digits"><code>@Digits</code></a> annotation for action parameters of type <code>java.math.BigDecimal</code>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1920,7 +1920,7 @@ How to use the supporting <a href="rgcms.html#_rgcms_methods_prefixes_default"><
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=qAJDGxztWIQ" target="_blank">044</a><br>
-How to use <a href="rgant.html#_rgant_DomainObject_bounded"><code>@DomainObject#bounded()</code></a> so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.</p>
+How to use <a href="rgant.html#_rgant-DomainObject_bounded"><code>@DomainObject#bounded()</code></a> so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -2050,7 +2050,7 @@ extension.</p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0YoFa44Xr6M" target="_blank">049</a><br>
-Using the <a href="rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a> annotation to exclude methods from a domain object
+Using the <a href="rgant.html#_rgant-Programmatic"><code>@Programmatic</code></a> annotation to exclude methods from a domain object
(eg implementing methods of an interface as defined by the (non-ASF)
<a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">Isis addons' fullcalendar2 </a> wicket extension) that would
otherwise be part of the Apache Isis metamodel (and thus show up in the UI).</p>
@@ -2295,7 +2295,7 @@ How to rename a menu (on the top-level menubar) as rendered in the <a href="#ugv
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=mgHqRxQrp28" target="_blank">058</a><br>
-How to rename various elements (collections, title) of the <a href="rgant.html#_rgant_HomePage">home page</a> view model,
+How to rename various elements (collections, title) of the <a href="rgant.html#_rgant-HomePage">home page</a> view model,
for an improved initial page.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
[5/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.pdf b/content/guides/rgcms.pdf
index b80ad3e..4c92b4d 100644
--- a/content/guides/rgcms.pdf
+++ b/content/guides/rgcms.pdf
@@ -4,16 +4,16 @@
<< /Title (Classes, Methods and Schema)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160426190330+01'00')
-/ModDate (D:20160426190330+01'00')
+/CreationDate (D:20160513191512+01'00')
+/ModDate (D:20160513191512+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 912 0 R
-/PageLabels 938 0 R
+/Outlines 934 0 R
+/PageLabels 963 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 75
-/Kids [7 0 R 10 0 R 12 0 R 37 0 R 60 0 R 125 0 R 149 0 R 154 0 R 162 0 R 167 0 R 171 0 R 176 0 R 186 0 R 190 0 R 193 0 R 204 0 R 210 0 R 218 0 R 222 0 R 232 0 R 242 0 R 246 0 R 260 0 R 289 0 R 296 0 R 307 0 R 311 0 R 324 0 R 335 0 R 345 0 R 361 0 R 388 0 R 411 0 R 414 0 R 425 0 R 432 0 R 439 0 R 446 0 R 450 0 R 462 0 R 492 0 R 513 0 R 533 0 R 544 0 R 556 0 R 567 0 R 574 0 R 584 0 R 594 0 R 610 0 R 627 0 R 641 0 R 657 0 R 674 0 R 683 0 R 691 0 R 696 0 R 703 0 R 706 0 R 714 0 R 721 0 R 731 0 R 745 0 R 757 0 R 768 0 R 786 0 R 797 0 R 808 0 R 827 0 R 831 0 R 842 0 R 848 0 R 855 0 R 858 0 R 862 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 37 0 R 60 0 R 125 0 R 149 0 R 154 0 R 162 0 R 167 0 R 171 0 R 176 0 R 186 0 R 190 0 R 193 0 R 204 0 R 210 0 R 218 0 R 222 0 R 232 0 R 242 0 R 246 0 R 260 0 R 289 0 R 296 0 R 307 0 R 311 0 R 324 0 R 335 0 R 345 0 R 361 0 R 388 0 R 411 0 R 414 0 R 425 0 R 432 0 R 439 0 R 446 0 R 450 0 R 462 0 R 492 0 R 513 0 R 533 0 R 544 0 R 556 0 R 567 0 R 574 0 R 584 0 R 594 0 R 610 0 R 627 0 R 641 0 R 657 0 R 674 0 R 683 0 R 691 0 R 696 0 R 703 0 R 706 0 R 714 0 R 721 0 R 731 0 R 745 0 R 757 0 R 768 0 R 786 0 R 797 0 R 808 0 R 827 0 R 831 0 R 848 0 R 853 0 R 856 0 R 862 0 R 868 0 R]
>>
endobj
4 0 obj
@@ -80,15 +80,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABI+NotoSerif
/Subtype /TrueType
-/FontDescriptor 940 0 R
+/FontDescriptor 965 0 R
/FirstChar 32
/LastChar 255
-/Widths 942 0 R
-/ToUnicode 941 0 R
+/Widths 967 0 R
+/ToUnicode 966 0 R
>>
endobj
9 0 obj
-<< /Length 19720
+<< /Length 23082
>>
stream
q
@@ -973,7 +973,18 @@ ET
BT
60.24 363.77599999999967 Td
/F1.0 10.5 Tf
-<342e312e20436f6d6d6f6e20536368656d61> Tj
+<342e312e20436f6d6d616e642028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+137.73000000000002 363.77599999999967 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
0.000 0.000 0.000 SCN
@@ -982,9 +993,20 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 363.77599999999967 Td
+216.48000000000002 363.77599999999967 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+223.96024999999997 363.77599999999967 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1013,7 +1035,18 @@ ET
BT
60.24 345.29599999999965 Td
/F1.0 10.5 Tf
-[<342e322e2041> 20.01953125 <6374696f6e20496e766f636174696f6e204d656d656e746f>] TJ
+[<342e322e20496e746572> 20.01953125 <616374696f6e20457865637574696f6e2028>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+194.56629492187503 345.29599999999965 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
0.000 0.000 0.000 SCN
@@ -1022,9 +1055,20 @@ ET
0.200 0.200 0.200 SCN
BT
-223.96024999999997 345.29599999999965 Td
+273.316294921875 345.29599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+282.74974999999995 345.29599999999965 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1042,7 +1086,149 @@ ET
BT
535.3009999999999 345.29599999999965 Td
/F1.0 10.5 Tf
-<3730> Tj
+<3638> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 326.81599999999963 Td
+/F1.0 10.5 Tf
+<342e332e204368616e6765732028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+128.07 326.81599999999963 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+206.82 326.81599999999963 Td
+/F1.0 10.5 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+213.27124999999995 326.81599999999963 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 326.81599999999963 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.3009999999999 326.81599999999963 Td
+/F1.0 10.5 Tf
+<3638> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 308.3359999999996 Td
+/F1.0 10.5 Tf
+[<342e342e2041> 20.01953125 <6374696f6e20496e766f636174696f6e204d656d656e746f>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+223.96024999999997 308.3359999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 308.3359999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.3009999999999 308.3359999999996 Td
+/F1.0 10.5 Tf
+<3638> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 289.8559999999996 Td
+/F1.0 10.5 Tf
+<342e352e20436f6d6d6f6e20536368656d61> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+170.51524999999992 289.8559999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 289.8559999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.3009999999999 289.8559999999996 Td
+/F1.0 10.5 Tf
+<3731> Tj
ET
0.000 0.000 0.000 SCN
@@ -1062,7 +1248,7 @@ endobj
/F3.0 18 0 R
>>
>>
-/Annots [863 0 R 864 0 R 865 0 R 866 0 R 867 0 R 868 0 R 869 0 R 870 0 R 871 0 R 872 0 R 873 0 R 874 0 R 875 0 R 876 0 R 877 0 R 878 0 R 879 0 R 880 0 R 881 0 R 882 0 R 883 0 R 884 0 R 885 0 R 886 0 R 887 0 R 888 0 R 889 0 R 890 0 R 891 0 R 892 0 R 893 0 R 894 0 R 895 0 R 896 0 R 897 0 R 898 0 R 899 0 R 900 0 R 901 0 R 902 0 R 903 0 R 904 0 R 905 0 R 906 0 R 907 0 R 908 0 R 909 0 R 910 0 R]
+/Annots [873 0 R 874 0 R 875 0 R 876 0 R 877 0 R 878 0 R 879 0 R 880 0 R 881 0 R 882 0 R 883 0 R 884 0 R 885 0 R 886 0 R 887 0 R 888 0 R 889 0 R 890 0 R 891 0 R 892 0 R 893 0 R 894 0 R 895 0 R 896 0 R 897 0 R 898 0 R 899 0 R 900 0 R 901 0 R 902 0 R 903 0 R 904 0 R 905 0 R 906 0 R 907 0 R 908 0 R 909 0 R 910 0 R 911 0 R 912 0 R 913 0 R 914 0 R 915 0 R 916 0 R 917 0 R 918 0 R 919 0 R 920 0 R 921 0 R 922 0 R 923 0 R 924 0 R 925 0 R 926 0 R 927 0 R 928 0 R 929 0 R 930 0 R 931 0 R 932 0 R]
>>
endobj
11 0 obj
@@ -1817,7 +2003,7 @@ endobj
/F3.0 18 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [17 0 R 20 0 R 21 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R]
@@ -1839,11 +2025,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABJ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 944 0 R
+/FontDescriptor 969 0 R
/FirstChar 32
/LastChar 255
-/Widths 946 0 R
-/ToUnicode 945 0 R
+/Widths 971 0 R
+/ToUnicode 970 0 R
>>
endobj
17 0 obj
@@ -1858,22 +2044,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 948 0 R
+/FontDescriptor 973 0 R
/FirstChar 32
/LastChar 255
-/Widths 950 0 R
-/ToUnicode 949 0 R
+/Widths 975 0 R
+/ToUnicode 974 0 R
>>
endobj
19 0 obj
<< /Type /Font
/BaseFont /AAAABL+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 952 0 R
+/FontDescriptor 977 0 R
/FirstChar 32
/LastChar 255
-/Widths 954 0 R
-/ToUnicode 953 0 R
+/Widths 979 0 R
+/ToUnicode 978 0 R
>>
endobj
20 0 obj
@@ -3584,7 +3770,7 @@ endobj
/F6.0 42 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [39 0 R 43 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R]
@@ -3611,22 +3797,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABM+FontAwesome
/Subtype /TrueType
-/FontDescriptor 956 0 R
+/FontDescriptor 981 0 R
/FirstChar 32
/LastChar 255
-/Widths 958 0 R
-/ToUnicode 957 0 R
+/Widths 983 0 R
+/ToUnicode 982 0 R
>>
endobj
42 0 obj
<< /Type /Font
/BaseFont /AAAABN+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 960 0 R
+/FontDescriptor 985 0 R
/FirstChar 32
/LastChar 255
-/Widths 962 0 R
-/ToUnicode 961 0 R
+/Widths 987 0 R
+/ToUnicode 986 0 R
>>
endobj
43 0 obj
@@ -7773,7 +7959,7 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [61 0 R 62 0 R 63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R]
@@ -10852,7 +11038,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 138 0 R 141 0 R 142 0 R 143 0 R 145 0 R 146 0 R 147 0 R]
@@ -10967,22 +11153,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABO+mplus1mn-bold
/Subtype /TrueType
-/FontDescriptor 964 0 R
+/FontDescriptor 989 0 R
/FirstChar 32
/LastChar 255
-/Widths 966 0 R
-/ToUnicode 965 0 R
+/Widths 991 0 R
+/ToUnicode 990 0 R
>>
endobj
140 0 obj
<< /Type /Font
/BaseFont /AAAABP+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 968 0 R
+/FontDescriptor 993 0 R
/FirstChar 32
/LastChar 255
-/Widths 970 0 R
-/ToUnicode 969 0 R
+/Widths 995 0 R
+/ToUnicode 994 0 R
>>
endobj
141 0 obj
@@ -13813,7 +13999,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [151 0 R]
@@ -15251,7 +15437,7 @@ endobj
/F4.0 19 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [155 0 R 157 0 R 158 0 R 159 0 R]
@@ -17376,7 +17562,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [164 0 R]
@@ -19437,7 +19623,7 @@ endobj
/Contents 166 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 165 0 R
-/Stamp1 911 0 R
+/Stamp1 933 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -21745,7 +21931,7 @@ endobj
/F4.0 19 0 R
/F1.1 174 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -21760,11 +21946,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABQ+NotoSerif
/Subtype /TrueType
-/FontDescriptor 972 0 R
+/FontDescriptor 997 0 R
/FirstChar 32
/LastChar 255
-/Widths 974 0 R
-/ToUnicode 973 0 R
+/Widths 999 0 R
+/ToUnicode 998 0 R
>>
endobj
175 0 obj
@@ -23611,7 +23797,7 @@ endobj
/F1.1 174 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [177 0 R 178 0 R 179 0 R 181 0 R 182 0 R 183 0 R]
@@ -25820,7 +26006,7 @@ endobj
/F3.1 140 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [187 0 R 188 0 R]
@@ -28867,7 +29053,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -29654,7 +29840,7 @@ endobj
/F5.1 41 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [195 0 R 196 0 R 197 0 R 198 0 R 200 0 R 201 0 R]
@@ -32122,7 +32308,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -33027,7 +33213,7 @@ endobj
/F2.0 16 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [211 0 R 212 0 R 213 0 R 215 0 R]
@@ -35148,7 +35334,7 @@ endobj
/F4.0 19 0 R
/F1.1 174 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -37965,7 +38151,7 @@ endobj
/F2.0 16 0 R
/F5.1 41 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [223 0 R 224 0 R 225 0 R 227 0 R 228 0 R 229 0 R 230 0 R]
@@ -39690,7 +39876,7 @@ endobj
/F6.0 42 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [234 0 R 235 0 R 236 0 R 238 0 R]
@@ -42327,7 +42513,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -44612,7 +44798,7 @@ endobj
/F5.1 41 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 257 0 R 258 0 R]
@@ -46992,7 +47178,7 @@ endobj
/F2.0 16 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 287 0 R]
@@ -48127,7 +48313,7 @@ endobj
/F7.0 139 0 R
>>
/XObject << /I2 292 0 R
-/Stamp1 911 0 R
+/Stamp1 933 0 R
>>
>>
/Annots [290 0 R 291 0 R 293 0 R 294 0 R]
@@ -50421,7 +50607,7 @@ endobj
/F7.0 139 0 R
/F1.1 174 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [297 0 R 298 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R]
@@ -52650,7 +52836,7 @@ endobj
/F3.0 18 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [309 0 R]
@@ -54093,7 +54279,7 @@ endobj
/F7.0 139 0 R
/F1.1 174 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [312 0 R 313 0 R 315 0 R 316 0 R 317 0 R 318 0 R 320 0 R 322 0 R]
@@ -55011,7 +55197,7 @@ endobj
>>
/XObject << /I3 326 0 R
/I4 328 0 R
-/Stamp1 911 0 R
+/Stamp1 933 0 R
>>
>>
/Annots [325 0 R 327 0 R 330 0 R 331 0 R 332 0 R]
@@ -57349,7 +57535,7 @@ endobj
/F5.1 41 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R]
@@ -58909,7 +59095,7 @@ endobj
/F5.1 41 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [346 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R]
@@ -60408,7 +60594,7 @@ endobj
/F1.0 8 0 R
/F5.1 41 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [362 0 R 363 0 R 364 0 R 367 0 R 368 0 R 369 0 R 370 0 R 372 0 R 373 0 R 374 0 R 376 0 R 377 0 R 378 0 R 379 0 R 381 0 R 382 0 R 383 0 R 384 0 R 386 0 R]
@@ -61524,7 +61710,7 @@ endobj
/F3.0 18 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [389 0 R 390 0 R 391 0 R 393 0 R 394 0 R 395 0 R 396 0 R 398 0 R 399 0 R 400 0 R 401 0 R 403 0 R 404 0 R 405 0 R 406 0 R 408 0 R 409 0 R]
@@ -63596,7 +63782,7 @@ endobj
/F7.0 139 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [412 0 R]
@@ -65509,7 +65695,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [416 0 R 417 0 R 418 0 R 422 0 R 423 0 R]
@@ -68107,7 +68293,7 @@ endobj
/F7.0 139 0 R
/F3.0 18 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [426 0 R 427 0 R 429 0 R 430 0 R]
@@ -69862,7 +70048,7 @@ endobj
/F7.0 139 0 R
/F5.1 41 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [434 0 R 436 0 R]
@@ -71103,7 +71289,7 @@ endobj
/F7.0 139 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [444 0 R]
@@ -73596,7 +73782,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [448 0 R]
@@ -75071,7 +75257,7 @@ endobj
/F2.0 16 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [451 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R]
@@ -77177,7 +77363,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R]
@@ -78516,7 +78702,7 @@ endobj
/F2.0 16 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [493 0 R 494 0 R 496 0 R 497 0 R 499 0 R 500 0 R 502 0 R 503 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R]
@@ -79766,7 +79952,7 @@ endobj
/F5.1 41 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [516 0 R 517 0 R 519 0 R 520 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 528 0 R 529 0 R 530 0 R 531 0 R]
@@ -81248,7 +81434,7 @@ endobj
/F3.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R]
@@ -82614,7 +82800,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [545 0 R 546 0 R 547 0 R 549 0 R 550 0 R 551 0 R 553 0 R 554 0 R]
@@ -83250,7 +83436,7 @@ endobj
/F1.0 8 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [558 0 R 560 0 R 562 0 R 563 0 R 564 0 R 565 0 R]
@@ -84077,7 +84263,7 @@ endobj
/F3.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [568 0 R 569 0 R 570 0 R 571 0 R 572 0 R]
@@ -84923,7 +85109,7 @@ endobj
/F3.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R]
@@ -86090,7 +86276,7 @@ endobj
/F1.0 8 0 R
/F5.1 41 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [585 0 R 586 0 R 587 0 R 588 0 R 590 0 R 591 0 R]
@@ -87451,7 +87637,7 @@ endobj
/F6.0 42 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [595 0 R 596 0 R 598 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R]
@@ -88993,7 +89179,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R]
@@ -90337,7 +90523,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R]
@@ -91466,7 +91652,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [642 0 R 643 0 R 644 0 R 645 0 R 646 0 R 647 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R]
@@ -92601,7 +92787,7 @@ endobj
/F4.0 19 0 R
/F5.1 41 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [659 0 R 660 0 R 662 0 R 664 0 R 665 0 R 668 0 R 669 0 R 671 0 R 672 0 R]
@@ -94369,7 +94555,7 @@ endobj
/F5.1 41 0 R
/F6.0 42 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [676 0 R 677 0 R 679 0 R 680 0 R]
@@ -95839,7 +96025,7 @@ endobj
/F5.1 41 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -99245,7 +99431,7 @@ endobj
/F5.1 41 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -100863,7 +101049,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I5 699 0 R
-/Stamp1 911 0 R
+/Stamp1 933 0 R
>>
>>
/Annots [698 0 R 701 0 R]
@@ -102936,7 +103122,7 @@ endobj
/F7.0 139 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
>>
@@ -104919,7 +105105,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [708 0 R 710 0 R 711 0 R]
@@ -107012,7 +107198,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [716 0 R 718 0 R]
@@ -108310,7 +108496,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [724 0 R 727 0 R 728 0 R 729 0 R]
@@ -109821,7 +110007,7 @@ endobj
/F1.0 8 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [733 0 R 734 0 R 735 0 R 736 0 R 737 0 R 738 0 R 741 0 R 742 0 R 743 0 R]
@@ -111568,7 +111754,7 @@ endobj
/F3.0 18 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [748 0 R 749 0 R 752 0 R 753 0 R 755 0 R]
@@ -112799,7 +112985,7 @@ endobj
/F7.0 139 0 R
/F3.1 140 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [761 0 R 764 0 R 766 0 R]
@@ -113831,7 +114017,7 @@ endobj
/F2.0 16 0 R
/F7.0 139 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [769 0 R 770 0 R 772 0 R 774 0 R 777 0 R 780 0 R 781 0 R 783 0 R 784 0 R]
@@ -115980,7 +116166,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [787 0 R 788 0 R 789 0 R 790 0 R 792 0 R 795 0 R]
@@ -117151,7 +117337,7 @@ endobj
/F3.1 140 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [798 0 R 800 0 R 802 0 R 805 0 R]
@@ -118548,7 +118734,7 @@ endobj
/F3.0 18 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [809 0 R 810 0 R 811 0 R 812 0 R 813 0 R 814 0 R 815 0 R 816 0 R 817 0 R 819 0 R 820 0 R 821 0 R 822 0 R 824 0 R 825 0 R]
@@ -118577,7 +118763,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_PropertyLayout)
+/URI (rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
/Rect [51.87300000000001 701.5559999999999 130.623 712.0559999999999]
@@ -118588,7 +118774,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_CollectionLayout)
+/URI (rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
/Rect [135.9675 701.5559999999999 225.2175 712.0559999999999]
@@ -118599,7 +118785,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ActionLayout)
+/URI (rgant.pdf#_rgant-ActionLayout)
>>
/Subtype /Link
/Rect [230.562 701.5559999999999 298.812 712.0559999999999]
@@ -118610,7 +118796,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_DomainObjectLayout)
+/URI (rgant.pdf#_rgant-DomainObjectLayout)
>>
/Subtype /Link
/Rect [323.361 701.5559999999999 423.111 712.0559999999999]
@@ -118657,7 +118843,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_PropertyLayout)
+/URI (rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
/Rect [290.91150000000005 397.13600000000014 369.66150000000005 407.63600000000014]
@@ -118668,7 +118854,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_CollectionLayout)
+/URI (rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
/Rect [301.41150000000005 375.35600000000017 390.66150000000005 385.85600000000017]
@@ -118679,7 +118865,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ActionLayout)
+/URI (rgant.pdf#_rgant-ActionLayout)
>>
/Subtype /Link
/Rect [280.41150000000005 353.5760000000002 348.66150000000005 364.0760000000002]
@@ -118690,7 +118876,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_DomainObjectLayout)
+/URI (rgant.pdf#_rgant-DomainObjectLayout)
>>
/Subtype /Link
/Rect [311.91150000000005 331.7960000000002 411.66150000000005 342.2960000000002]
@@ -119971,7 +120157,7 @@ endobj
/Font << /F3.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 911 0 R
+/XObject << /Stamp1 933 0 R
>>
>>
/Annots [828 0 R 829 0 R]
@@ -120000,7 +120186,7 @@ endobj
>>
endobj
830 0 obj
-<< /Length 8454
+<< /Length 18342
>>
stream
q
@@ -120038,7 +120224,7 @@ ET
BT
48.24 737.426 Td
/F1.0 10.5 Tf
-[<7363656e6172696f732c20417061636865204973697320646566696e65732074776f207374616e646172642058> 9.765625 <534420736368656d61733a>] TJ
+[<7363656e6172696f732c20417061636865204973697320646566696e65732061206e756d626572206f66207374616e646172642058> 9.765625 <534420736368656d61733a>] TJ
ET
0.000 0.000 0.000 SCN
@@ -120061,65 +120247,115 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.884 Tw
+
BT
66.24000000000001 709.6460000000001 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
+1.884 Tw
+
BT
-84.93 709.6460000000001 Td
+86.81393885216346 709.6460000000001 Td
/F1.0 10.5 Tf
-<636f6d6d6f6e20736368656d61> Tj
+<636f6d6d616e64> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.884 Tw
+
BT
-169.51800000000003 709.6460000000001 Td
+136.97243885216346 709.6460000000001 Td
/F1.0 10.5 Tf
-<2c20776869636820646566696e65732074686520> Tj
+<20736368656d612028> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
+1.884 Tw
+
BT
-266.265 709.6460000000001 Td
+187.80131655649038 709.6460000000001 Td
/F3.0 10.5 Tf
-<6f696444746f> Tj
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.884 Tw
+
+BT
+266.5513165564904 709.6460000000001 Td
+/F1.0 10.5 Tf
+<292c2077686963682063617074757265732074686520> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.884 Tw
+
+BT
+381.2185719651442 709.6460000000001 Td
+/F6.0 10.5 Tf
+<696e74656e74696f6e> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.884 Tw
+
BT
-297.765 709.6460000000001 Td
+425.4025719651442 709.6460000000001 Td
/F1.0 10.5 Tf
-<20636f6d706c657820747970653a20746865206f626a656374d573207479706520616e6420697473206964656e7469666965722e> Tj
+[<206f662061207573657220746f20696e766f6b> 20.01953125 <6520616e>] TJ
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-66.24000000000001 681.8660000000001 Td
+66.24000000000001 693.8660000000001 Td
/F1.0 10.5 Tf
-[<497420616c736f20646566696e657320736f6d652074776f20667572746865722058> 9.765625 <53442074797065732c20776869636820617265206275696c64696e6720626c6f636b73207573656420696ec9>] TJ
+<616374696f6e206f72206564697420612070726f7065727479> Tj
ET
0.000 0.000 0.000 SCN
@@ -120130,7 +120366,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 654.0860000000001 Td
+56.88050000000001 672.0860000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -120142,10 +120378,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.840 Tw
+1.090 Tw
BT
-66.24000000000001 654.0860000000001 Td
+66.24000000000001 672.0860000000001 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -120157,12 +120393,42 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-1.840 Tw
+1.090 Tw
BT
-86.76966666666667 654.0860000000001 Td
+86.01960955255682 672.0860000000001 Td
/F1.0 10.5 Tf
-<616374696f6e206d656d656e746f20696e766f636174696f6e> Tj
+[<696e746572> 20.01953125 <616374696f6e20657865637574696f6e>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.090 Tw
+
+BT
+193.94651402698864 672.0860000000001 Td
+/F1.0 10.5 Tf
+<20736368656d612028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.090 Tw
+
+BT
+243.18673313210226 672.0860000000001 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
@@ -120172,12 +120438,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.840 Tw
+1.090 Tw
BT
-227.62099999999998 654.0860000000001 Td
+321.9367331321023 672.0860000000001 Td
/F1.0 10.5 Tf
-<20736368656d612c20776869636820616c6c6f777320616374696f6e20696e766f636174696f6e7320746f20626520636170747572656420616e64> Tj
+<292c207768696368206361707475726573207468652061637475616c20657865637574696f6e206f6620616e> Tj
ET
@@ -120188,22 +120454,37 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 638.3060000000002 Td
+66.24000000000001 656.3060000000002 Td
+/F1.0 10.5 Tf
+<616374696f6e20696e766f636174696f6e2f70726f70657274792065646974> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 634.5260000000002 Td
/F1.0 10.5 Tf
-<726569666965642e> Tj
+<a5> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+0.000 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.011 Tw
+4.206 Tw
BT
-66.24000000000001 610.5260000000002 Td
+66.24000000000001 634.5260000000002 Td
/F1.0 10.5 Tf
-<54686520286e6f6e2d4153462920> Tj
+<74686520> Tj
ET
@@ -120213,12 +120494,42 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.011 Tw
+4.206 Tw
BT
-139.81421428571429 610.5260000000002 Td
+89.13575 634.5260000000002 Td
/F1.0 10.5 Tf
-<49736973206164646f6e7327207075626c6973686d71> Tj
+<6368616e676573> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+4.206 Tw
+
+BT
+129.63425 634.5260000000002 Td
+/F1.0 10.5 Tf
+<20736368656d612028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+4.206 Tw
+
+BT
+185.10674999999998 634.5260000000002 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
@@ -120228,12 +120539,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.011 Tw
+4.206 Tw
BT
-254.4749285714286 610.5260000000002 Td
+263.85675 634.5260000000002 Td
/F1.0 10.5 Tf
-<206d6f64756c652075736573207468697320584d4c20666f726d617420746f207075626c697368206d65737361676573206f6e746f20616e> Tj
+<292c207768696368206361707475726573207768696368206f626a656374732068617665206265656e20637265617465642c> Tj
ET
@@ -120244,51 +120555,110 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 594.7460000000002 Td
+66.24000000000001 618.7460000000002 Td
+/F1.0 10.5 Tf
+<75706461746564206f722064656c657465642061732074686520726573756c74206f6620616e20657865637574696f6e206f6620616e20616374696f6e20696e766f636174696f6e2f70726f70657274792065646974> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 596.9660000000002 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.151 Tw
+
+BT
+66.24000000000001 596.9660000000002 Td
+/F1.0 10.5 Tf
+<74686520> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
+3.151 Tw
+
BT
-66.24000000000001 594.7460000000002 Td
+88.08052050781251 596.9660000000002 Td
/F1.0 10.5 Tf
-[<4170616368652041> 20.01953125 <63746976654d51>] TJ
+<616374696f6e206d656d656e746f20696e766f636174696f6e> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+3.151 Tw
+
BT
-154.87029492187503 594.7460000000002 Td
+231.55356152343748 596.9660000000002 Td
/F1.0 10.5 Tf
-<206d6573736167652071756575652e> Tj
+<20736368656d6120286465707265636174656420696e20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.151 Tw
+
+BT
+362.6481435546874 596.9660000000002 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+3.151 Tw
+
BT
-48.24000000000001 560.9660000000002 Td
+441.3981435546874 596.9660000000002 Td
/F1.0 10.5 Tf
-<5468652073656374696f6e732062656c6f77206469736375737320746865736520736368656d617320696e206d6f72652064657461696c2e> Tj
+[<2c207265706c616365642062> 20.01953125 <7920656974686572>] TJ
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24000000000001 521.1260000000004 Td
-/F2.0 18 Tf
-<342e312e20436f6d6d6f6e20536368656d61> Tj
+66.24000000000001 581.1860000000003 Td
+/F1.0 10.5 Tf
+[<22636d6422206f72202269786e> 40.0390625 <22292c20776869636820616c6c6f777320616374696f6e20696e766f636174696f6e7320746f20626520636170747572656420616e6420726569666965642e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -120296,12 +120666,42 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.052 Tw
+1.080 Tw
BT
-48.24000000000001 493.10600000000034 Td
+48.24000000000001 553.4060000000004 Td
/F1.0 10.5 Tf
-<546865206d61696e20707572706f7365206f662074686520636f6d6d6f6e20736368656d6120697320746f20646566696e652074686520> Tj
+[<54686573652065616368207573652058> 9.765625 <534420747970657320646566696e65642062> 20.01953125 <792074686520>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.080 Tw
+
+BT
+260.8381194010417 553.4060000000004 Td
+/F1.0 10.5 Tf
+<636f6d6d6f6e20736368656d61> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.080 Tw
+
+BT
+346.50660234375 553.4060000000004 Td
+/F1.0 10.5 Tf
+<20286d6f7374206e6f7461626c792074686520> Tj
ET
@@ -120311,10 +120711,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.052 Tw
+1.080 Tw
BT
-337.49608823529405 493.10600000000034 Td
+443.7535341145833 553.4060000000004 Td
/F3.0 10.5 Tf
<6f696444746f> Tj
ET
@@ -120326,12 +120726,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.052 Tw
+1.080 Tw
BT
-368.99608823529405 493.10600000000034 Td
+475.2535341145833 553.4060000000004 Td
/F1.0 10.5 Tf
-<20636f6d706c657820747970653a20746865206f626a656374d573207479706520616e64> Tj
+<20636f6d706c65782074797065> Tj
ET
@@ -120341,12 +120741,23 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.601 Tw
+BT
+48.24000000000001 537.6260000000003 Td
+/F1.0 10.5 Tf
+<7768696368206964656e746966696573206120646f6d61696e206f626a656374292e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.353 Tw
BT
-48.24000000000001 477.32600000000036 Td
+48.24000000000001 509.8460000000004 Td
/F1.0 10.5 Tf
-<697473206964656e7469666965722e2054686973206973206261736963616c6c79206120666f726d616c20584d4c206571756976616c656e7420746f2074686520> Tj
+<284173206f6620> Tj
ET
@@ -120356,12 +120767,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.601 Tw
+1.353 Tw
BT
-372.61606666666665 477.32600000000036 Td
+82.08808333333334 509.8460000000004 Td
/F3.0 10.5 Tf
-<426f6f6b6d61726b> Tj
+<312e31332e302d534e415053484f54> Tj
ET
@@ -120371,49 +120782,72 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.601 Tw
+1.353 Tw
BT
-414.61606666666665 477.32600000000036 Td
+160.83808333333334 509.8460000000004 Td
/F1.0 10.5 Tf
-<206f626a656374206f627461696e65642066726f6d20746865> Tj
+<292074686520286e6f6e2d4153462920> Tj
ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.353 Tw
BT
-48.24000000000001 461.54600000000033 Td
-/F3.0 10.5 Tf
-<426f6f6b6d61726b53657276696365> Tj
+242.07070833333336 509.8460000000004 Td
+/F1.0 10.5 Tf
+<49736973206164646f6e732720636f6d6d616e64> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.353 Tw
+
BT
-126.99000000000001 461.54600000000033 Td
+355.6977916666667 509.8460000000004 Td
/F1.0 10.5 Tf
-<2e> Tj
+<20616e6420> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.353 Tw
+
+BT
+382.95187500000003 509.8460000000004 Td
+/F1.0 10.5 Tf
+<49736973206164646f6e7327207075626c6973686d71> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.363 Tw
+1.353 Tw
BT
-48.24000000000001 433.76600000000036 Td
+500.2959583333334 509.8460000000004 Td
/F1.0 10.5 Tf
-[<416c74686f7567682073696d706c652c207468697320697320616e20656e6f726d6f75736c7920706f77657266756c20636f6e636570742c20696e207468617420697420726570726573656e747320612055524920746f20616e> 20.01953125 <7920646f6d61696e>] TJ
+<206d6f64756c6573> Tj
ET
@@ -120423,12 +120857,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.004 Tw
+3.537 Tw
BT
-48.24000000000001 417.98600000000033 Td
+48.24000000000001 494.0660000000004 Td
/F1.0 10.5 Tf
-[<6f626a656374206d616e616765642062> 20.01953125 <79206120676976656e204170616368652049736973206170706c69636174696f6e2e2020576974682069742c207765206861766520746865206162696c69747920746f206c6f6f6b757020616e> 20.01953125 <79>] TJ
+<7573657320746865736520736368656d617320746f20726569667920636f72726573706f6e64696e67206170706c6962206f626a656374732028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.537 Tw
+
+BT
+365.7916 494.0660000000004 Td
+/F3.0 10.5 Tf
+<436f6d6d616e64> Tj
ET
@@ -120438,10 +120887,66 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+3.537 Tw
+
BT
-48.24000000000001 402.20600000000036 Td
+402.5416 494.0660000000004 Td
/F1.0 10.5 Tf
-[<617262697472> 20.01953125 <617279206f626a6563742e2020467572746865722064697363757373696f6e20616e64206578616d706c65732063616e20626520666f756e6420>] TJ
+<2c20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.537 Tw
+
+BT
+411.42330000000004 494.0660000000004 Td
+/F3.0 10.5 Tf
+<496e746572616374696f6e2e457865637574696f6e> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.537 Tw
+
+BT
+521.6733 494.0660000000004 Td
+/F1.0 10.5 Tf
+<20616e64> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+48.24000000000001 478.2860000000004 Td
+/F3.0 10.5 Tf
+<5075626c69736865644f626a65637473> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+132.24 478.2860000000004 Td
+/F1.0 10.5 Tf
+<292c2065697468657220746f2070657273697374206f72207075626c697368696e67207573696e6720616e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -120450,9 +120955,9 @@ ET
0.259 0.545 0.792 SCN
BT
-371.05179492187506 402.20600000000036 Td
+337.54650000000004 478.2860000000004 Td
/F1.0 10.5 Tf
-<68657265> Tj
+[<4170616368652041> 20.01953125 <63746976654d51>] TJ
ET
0.000 0.000 0.000 SCN
@@ -120461,110 +120966,466 @@ ET
0.200 0.200 0.200 SCN
BT
-393.88929492187503 402.20600000000036 Td
+426.17679492187506 478.2860000000004 Td
/F1.0 10.5 Tf
-<2e> Tj
+<206d6573736167652071756575652e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 450.50600000000037 Td
+/F1.0 10.5 Tf
+<5468652073656374696f6e732062656c6f77206469736375737320746865736520736368656d617320696e206d6f72652064657461696c2e> Tj
+ET
+
0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
+0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3638> Tj
+48.24000000000001 410.6660000000004 Td
+/F2.0 18 Tf
+<342e312e20436f6d6d616e642028> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-Q
-Q
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
-endstream
-endobj
-831 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 830 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 16 0 R
-/F1.0 8 0 R
-/F3.0 18 0 R
->>
-/XObject << /Stamp1 911 0 R
->>
->>
-/Annots [834 0 R 835 0 R 836 0 R 837 0 R 839 0 R 840 0 R]
->>
+BT
+188.334 410.6660000000004 Td
+/F3.0 18 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.334 410.6660000000004 Td
+/F2.0 18 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.353 Tw
+
+BT
+48.24000000000001 382.64600000000036 Td
+/F1.0 10.5 Tf
+<5468652022636d642220736368656d612028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.353 Tw
+
+BT
+147.86275823102676 382.64600000000036 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.353 Tw
+
+BT
+226.61275823102676 382.64600000000036 Td
+/F1.0 10.5 Tf
+<2920646566696e6573207468652073657269616c697a656420666f726d206f662074686520> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.353 Tw
+
+BT
+403.3948607700892 382.64600000000036 Td
+/F6.0 10.5 Tf
+<696e74656e74696f6e> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.353 Tw
+
+BT
+447.57886077008925 382.64600000000036 Td
+/F1.0 10.5 Tf
+[<20746f20696e766f6b> 20.01953125 <6520616e20616374696f6e>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 366.8660000000003 Td
+/F1.0 10.5 Tf
+[<6f7220746f206564697420612070726f7065727479> 89.84375 <2e>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 327.02600000000035 Td
+/F2.0 18 Tf
+[<342e322e20496e746572> 20.01953125 <616374696f6e20457865637574696f6e2028>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+294.37164843749997 327.02600000000035 Td
+/F3.0 18 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+429.37164843749997 327.02600000000035 Td
+/F2.0 18 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.016 Tw
+
+BT
+48.24000000000001 299.0060000000003 Td
+/F1.0 10.5 Tf
+[<546865202269786e> 40.0390625 <2220736368656d612028>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.016 Tw
+
+BT
+141.1086420200893 299.0060000000003 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.016 Tw
+
+BT
+219.8586420200893 299.0060000000003 Td
+/F1.0 10.5 Tf
+<2920646566696e6573207468652073657269616c697a656420666f726d206f6620616e20616374696f6e20696e766f636174696f6e206f7220612070726f7065727479> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.943 Tw
+
+BT
+48.24000000000001 283.22600000000034 Td
+/F1.0 10.5 Tf
+[<656469742e2020496e20666163742c2069742061637475616c6c7920646566696e657320612063616c6c6772> 20.01953125 <617068206f66207375636820657865637574696f6e7320666f722074686f736520636173657320776865726520746865>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+48.24000000000001 267.4460000000003 Td
+/F3.0 10.5 Tf
+<57726170706572466163746f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+121.74000000000001 267.4460000000003 Td
+/F1.0 10.5 Tf
+<206973207573656420746f2065786563757465207375622d616374696f6e732f70726f70657274792065646974732e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 227.60600000000034 Td
+/F2.0 18 Tf
+<342e332e204368616e6765732028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+171.288 227.60600000000034 Td
+/F3.0 18 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.288 227.60600000000034 Td
+/F2.0 18 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.206 Tw
+
+BT
+48.24000000000001 199.58600000000033 Td
+/F1.0 10.5 Tf
+<54686520226368672220736368656d612028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.206 Tw
+
+BT
+143.37987499999997 199.58600000000033 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.206 Tw
+
+BT
+222.12987499999997 199.58600000000033 Td
+/F1.0 10.5 Tf
+<2920646566696e6573207468652073657269616c697a656420666f726d206964656e74696679696e67207768696368206f626a656374732068617665206265656e> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 183.80600000000032 Td
+/F1.0 10.5 Tf
+[<637265617465642c2075706461746564206f722064656c657465642061732074686520726573756c74206f6620696e766f6b696e6720616e20616374696f6e206f722065646974696e6720612070726f7065727479> 89.84375 <2e>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 143.9660000000003 Td
+/F2.0 18 Tf
+[<342e342e2041> 20.01953125 <6374696f6e20496e766f636174696f6e204d656d656e746f>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 115.94600000000032 Td
+/F1.0 10.5 Tf
+<546865202261696d2220736368656d6120646566696e6573207468652073657269616c697a656420666f726d20286f72206d656d656e746f29206f6620616e20616374696f6e20696e766f636174696f6e2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3638> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+831 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 830 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 16 0 R
+/F1.0 8 0 R
+/F3.0 18 0 R
+/F6.0 42 0 R
+>>
+/XObject << /Stamp1 933 0 R
+>>
+>>
+/Annots [834 0 R 835 0 R 836 0 R 837 0 R 838 0 R 839 0 R 840 0 R 841 0 R 844 0 R]
+>>
endobj
832 0 obj
[831 0 R /XYZ 0 841.89 null]
endobj
833 0 obj
<< /Limits [(_rgcms_methods_reserved_updated) (alternatives)]
-/Names [(_rgcms_methods_reserved_updated) 397 0 R (_rgcms_methods_reserved_updating) 402 0 R (_rgcms_methods_reserved_validate) 343 0 R (_rgcms_schema) 832 0 R (_rgcms_schema-aim) 853 0 R (_rgcms_schema-common) 838 0 R (action-parameter) 239 0 R (action-parameter-set) 240 0 R (actions) 202 0 R (actions-2) 216 0 R (adapter-classes) 717 0 R (alternative-approaches) 746 0 R (alternatives) 194 0 R]
+/Names [(_rgcms_methods_reserved_updated) 397 0 R (_rgcms_methods_reserved_updating) 402 0 R (_rgcms_methods_reserved_validate) 343 0 R (_rgcms_schema) 832 0 R (_rgcms_schema-aim) 846 0 R (_rgcms_schema-chg) 845 0 R (_rgcms_schema-cmd) 842 0 R (_rgcms_schema-common) 858 0 R (_rgcms_schema-ixn) 843 0 R (action-parameter) 239 0 R (action-parameter-set) 240 0 R (actions) 202 0 R (actions-2) 216 0 R (adapter-classes) 717 0 R (alternative-approaches) 746 0 R (alternatives) 194 0 R]
>>
endobj
834 0 obj
<< /Border [0 0 0]
-/Dest (_rgcms_schema-common)
+/Dest (_rgcms_schema-cmd)
/Subtype /Link
-/Rect [84.93 706.58 169.51800000000003 720.8600000000001]
+/Rect [86.81393885216346 706.58 136.97243885216346 720.8600000000001]
/Type /Annot
>>
endobj
835 0 obj
<< /Border [0 0 0]
-/Dest (_rgcms_schema-aim)
+/Dest (_rgcms_schema-ixn)
/Subtype /Link
-/Rect [86.76966666666667 651.0200000000001 227.62099999999998 665.3000000000002]
+/Rect [86.01960955255682 669.0200000000001 193.94651402698864 683.3000000000002]
/Type /Annot
>>
endobj
836 0 obj
<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-publishmq)
->>
+/Dest (_rgcms_schema-chg)
/Subtype /Link
-/Rect [139.81421428571429 607.4600000000002 254.4749285714286 621.7400000000002]
+/Rect [89.13575 631.4600000000002 129.63425 645.7400000000002]
/Type /Annot
>>
endobj
837 0 obj
<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://activemq.apache.org)
->>
+/Dest (_rgcms_schema-aim)
/Subtype /Link
-/Rect [66.24000000000001 591.6800000000002 154.87029492187503 605.9600000000003]
+/Rect [88.08052050781251 593.9000000000002 231.55356152343748 608.1800000000003]
/Type /Annot
>>
endobj
838 0 obj
-[831 0 R /XYZ 0 545.1500000000003 null]
+<< /Border [0 0 0]
+/Dest (_rgcms_schema-common)
+/Subtype /Link
+/Rect [260.8381194010417 550.3400000000004 346.50660234375 564.6200000000003]
+/Type /Annot
+>>
endobj
839 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgsvc.pdf#_rgsvc_api_BookmarkService)
+/URI (http://github.com/isisaddons/isis-module-command)
>>
/Subtype /Link
-/Rect [48.24000000000001 460.0760000000003 126.99000000000001 470.5760000000003]
+/Rect [242.07070833333336 506.7800000000004 355.6977916666667 521.0600000000004]
/Type /Annot
>>
endobj
@@ -120572,56 +121433,796 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (ugfun.pdf#_ugfun_core-concepts_building-blocks_oid)
+/URI (http://github.com/isisaddons/isis-module-publishmq)
>>
/Subtype /Link
-/Rect [371.05179492187506 399.1400000000004 393.88929492187503 413.42000000000036]
+/Rect [382.95187500000003 506.7800000000004 500.2959583333334 521.0600000000004]
/Type /Annot
>>
endobj
841 0 obj
-<< /Length 26202
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://activemq.apache.org)
+>>
+/Subtype /Link
+/Rect [337.54650000000004 475.2200000000004 426.17679492187506 489.5000000000004]
+/Type /Annot
+>>
+endobj
+842 0 obj
+[831 0 R /XYZ 0 434.6900000000004 null]
+endobj
+843 0 obj
+[831 0 R /XYZ 0 351.05000000000035 null]
+endobj
+844 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (rgsvc.pdf#_rgsvc_api_WrapperFactory)
+>>
+/Subtype /Link
+/Rect [48.24000000000001 265.97600000000034 121.74000000000001 276.47600000000034]
+/Type /Annot
+>>
+endobj
+845 0 obj
+[831 0 R /XYZ 0 251.63000000000034 null]
+endobj
+846 0 obj
+[831 0 R /XYZ 0 167.99000000000032 null]
+endobj
+847 0 obj
+<< /Length 32562
>>
stream
q
q
+0.5 w
+/DeviceRGB CS
+0.933 0.933 0.933 SCN
+113.807 691.210 m
+113.807 805.890 l
+S
+Q
/DeviceRGB cs
+0.749 0.412 0.000 scn
+/DeviceRGB CS
+0.749 0.412 0.000 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.749 0.412 0.000 scn
+0.749 0.412 0.000 SCN
+
+BT
+75.02333333333334 739.9699999999999 Td
+/F5.1 24 Tf
+<23> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.429 Tw
+
+BT
+125.80666666666667 789.9259999999999 Td
+/F1.0 10.5 Tf
+<5468697320736368656d6120686173206265656e2072656d6f76656420696e20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+2.429 Tw
+
+BT
+312.38286666666664 789.9259999999999 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.429 Tw
+
+BT
+391.13286666666664 789.9259999999999 Td
+/F1.0 10.5 Tf
+<2c207265706c61636564207769746820> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+2.429 Tw
+
+BT
+475.3227166666666 789.9259999999999 Td
+/F1.0 10.5 Tf
+<69786e2e787364> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.429 Tw
+
+BT
+511.37971666666664 789.9259999999999 Td
+/F1.0 10.5 Tf
+<2028666f72> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.869 Tw
+
+BT
+125.80666666666667 774.146 Td
+/F1.0 10.5 Tf
+<616374696f6e20696e766f636174696f6e732f70726f70657274792065646974732920616e64207769746820> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+0.869 Tw
+
+BT
+349.0331851851852 774.146 Td
+/F1.0 10.5 Tf
+<636d642e787364> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.869 Tw
+
+BT
+390.41368518518516 774.146 Td
+/F1.0 10.5 Tf
+<2028636f6d6d616e64732c2069652074686520> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.869 Tw
+
+BT
+490.85599999999994 774.146 Td
+/F6.0 10.5 Tf
+<696e74656e74696f6e> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.869 Tw
+
+BT
+535.04 774.146 Td
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+125.80666666666667 758.366 Td
+/F1.0 10.5 Tf
+[<746f20696e766f6b> 20.01953125 <6520616e20616374696f6e2f6564697420612070726f7065727479292e>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.786 Tw
+
+BT
+125.80666666666667 730.5859999999999 Td
+/F1.0 10.5 Tf
+<5468652072656d61696e696e6720636f6e74656e74206f6e207468697320706167652064657363726962657320686f7720> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.786 Tw
+
+BT
+394.2647727272727 730.5859999999999 Td
+/F3.0 10.5 Tf
+<436f6d6d616e64436f6e74657874> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.786 Tw
+
+BT
+467.7647727272727 730.5859999999999 Td
+/F1.0 10.5 Tf
+<20776f726b7320757020746f> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.132 Tw
+
+BT
+125.80666666666667 714.8059999999999 Td
+/F1.0 10.5 Tf
+<76312e31322e782e2020486f77657665722c206173206f6620> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.132 Tw
+
+BT
+251.56422727272724 714.8059999999999 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.132 Tw
+
+BT
+330.31422727272724 714.8059999999999 Td
+/F1.0 10.5 Tf
+<2074686520> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.132 Tw
+
+BT
+353.9871515151515 714.8059999999999 Td
+/F3.0 10.5 Tf
+<436f6d6d616e64436f6e74657874> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.132 Tw
+
+BT
+427.4871515151515 714.8059999999999 Td
+/F1.0 10.5 Tf
+<207573657320697473206f776e20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.132 Tw
+
+BT
+498.28999999999996 714.8059999999999 Td
+/F3.0 10.5 Tf
+<636d642e787364> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.132 Tw
+
+BT
+535.04 714.8059999999999 Td
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+125.80666666666667 699.026 Td
+/F1.0 10.5 Tf
+<736368656d61292e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.003 Tw
+
+BT
+48.24000000000001 667.2459999999999 Td
+/F1.0 10.5 Tf
+[<41> 20.01953125 <6374696f6e20696e766f636174696f6e73206172652063617074757265642028696e206d656d6f72792072> 20.01953125 <6174686572207468616e20696e2073657269616c697a656420666f726d29207768656e2074686520656e642d75736572>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+5.304 Tw
+
+BT
+48.24000000000001 651.4659999999999 Td
+/F1.0 10.5 Tf
+[<696e766f6b> 20.01953125 <65732074686520616374696f6e20227468726f756768> 40.0390625 <22207468652055492c2062> 20.01953125 <79207761> 20.01953125 <79206f662074686520>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+5.304 Tw
+
+BT
+351.063494140625 651.4659999999999 Td
+/F1.0 10.5 Tf
+<436f6d6d616e64436f6e74657874> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+5.304 Tw
+
+BT
+440.838494140625 651.4659999999999 Td
+/F1.0 10.5 Tf
+<20736572766963652e205573696e6720746865> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.633 Tw
+
+BT
+48.24000000000001 635.6859999999999 Td
+/F3.0 10.5 Tf
+<416374696f6e496e766f636174696f6e4d656d656e746f44746f5574696c73> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.633 Tw
+
+BT
+210.99 635.6859999999999 Td
+/F1.0 10.5 Tf
+<207574696c69747920636c6173732c206120736572766963652063616e20696e7374616e746961746520> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.633 Tw
+
+BT
+410.53999999999996 635.6859999999999 Td
+/F3.0 10.5 Tf
+<416374696f6e496e766f636174696f6e4d656d656e746f44746f> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.633 Tw
+
+BT
+547.04 635.6859999999999 Td
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 619.906 Td
+/F1.0 10.5 Tf
+<77686963682063616e207468656e2062652073657269616c697a656420746f2f66726f6d207573696e67207468652073616d6520> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+311.66400000000004 619.906 Td
+/F3.0 10.5 Tf
+<416374696f6e496e766f636174696f6e4d656d656e746f44746f5574696c73> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+474.41400000000004 619.906 Td
+/F1.0 10.5 Tf
+<20636c6173732e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
0.961 0.961 0.961 scn
-52.240 805.890 m
-543.040 805.890 l
-545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 375.170 l
-547.040 372.961 545.249 371.170 543.040 371.170 c
-52.240 371.170 l
-50.031 371.170 48.240 372.961 48.240 375.170 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
+52.240 604.090 m
+543.040 604.090 l
+545.249 604.090 547.040 602.299 547.040 600.090 c
+547.040 52.240 l
+547.040 50.031 545.249 48.240 543.040 48.240 c
+52.240 48.240 l
+50.031 48.240 48.240 50.031 48.240 52.240 c
+48.240 600.090 l
+48.240 602.299 50.031 604.090 52.240 604.090 c
h
f
-/DeviceRGB CS
0.800 0.800 0.800 SCN
0.75 w
-52.240 805.890 m
-543.040 805.890 l
-545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 375.170 l
-547.040 372.961 545.249 371.170 543.040 371.170 c
-52.240 371.170 l
-50.031 371.170 48.240 372.961 48.240 375.170 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
+52.240 604.090 m
+543.040 604.090 l
+545.249 604.090 547.040 602.299 547.040 600.090 c
+547.040 52.240 l
+547.040 50.031 545.249 48.240 543.040 48.240 c
+52.240 48.240 l
+50.031 48.240 48.240 50.031 48.240 52.240 c
+48.240 600.090 l
+48.240 602.299 50.031 604.090 52.240 604.090 c
h
S
Q
-/DeviceRGB cs
+q
+0.75 w
+0.961 0.961 0.961 SCN
+[3.0 3.0] 0 d
+52.990 48.240 m
+542.290 48.240 l
+S
+[ ] 0 d
+Q
+0.800 0.000 0.000 scn
+0.800 0.000 0.000 SCN
+
+BT
+59.24 581.2649999999999 Td
+/F7.0 11 Tf
+<3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+59.24 566.5249999999999 Td
+/F7.0 11 Tf
+<3c78733a736368656d61> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 566.5249999999999 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+119.74000000000001 566.5249999999999 Td
+/F3.0 11 Tf
+<7461726765744e616d6573706163653d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+207.74 566.5249999999999 Td
+/F3.0 11 Tf
+<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f61696d22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 551.7849999999999 Td
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+59.24 551.7849999999999 Td
+/F3.1 11 Tf
+<21> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 537.0449999999998 Td
+/F3.0 11 Tf
+<ca20202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+119.74000000000001 537.0449999999998 Td
+/F3.0 11 Tf
+<656c656d656e74466f726d44656661756c743d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+224.24 537.0449999999998 Td
+/F3.0 11 Tf
+<227175616c696669656422> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 522.3049999999998 Td
+/F3.0 11 Tf
+<ca20202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+119.74000000000001 522.3049999999998 Td
+/F3.0 11 Tf
+<786d6c6e733a78733d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+169.24 522.3049999999998 Td
+/F3.0 11 Tf
+<22687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d6122> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 507.56499999999994 Td
+/F3.0 11 Tf
+<ca20202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+119.74000000000001 507.56499999999994 Td
+/F3.0 11 Tf
+<786d6c6e733d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+152.74 507.56499999999994 Td
+/F3.0 11 Tf
+<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f61696d22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 492.82499999999993 Td
+/F3.0 11 Tf
+<ca20202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+119.74000000000001 492.82499999999993 Td
+/F3.0 11 Tf
+<786d6c6e733a636f6d6d6f6e3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+191.24 492.82499999999993 Td
+/F3.0 11 Tf
+<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
0.733 0.000 0.400 scn
-/DeviceRGB CS
0.733 0.000 0.400 SCN
BT
-59.24 783.0649999999999 Td
+400.24 492.82499999999993 Td
/F7.0 11 Tf
-<3c78733a736368656d61> Tj
+<3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -120630,7 +122231,29 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 783.0649999999999 Td
+59.24 463.3449999999999 Td
+/F3.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+81.24000000000001 463.3449999999999 Td
+/F7.0 11 Tf
+<3c78733a696d706f7274> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+136.24 463.3449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -120641,9 +122264,9 @@ ET
0.200 0.400 0.600 SCN
BT
-119.74000000000001 783.0649999999999 Td
+141.74 463.3449999999999 Td
/F3.0 11 Tf
-<7461726765744e616d6573706163653d> Tj
+<6e616d6573706163653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -120652,7 +122275,7 @@ ET
0.867 0.133 0.000 SCN
BT
-207.74 783.0649999999999 Td
+196.74 463.3449999999999 Td
/F3.0 11 Tf
<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e22> Tj
ET
@@ -120663,7 +122286,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 768.3249999999999 Td
+59.24 448.6049999999999 Td
ET
0.000 0.000 0.000 SCN
@@ -120672,9 +122295,9 @@ ET
0.694 0.129 0.275 SCN
BT
-59.24 768.3249999999999 Td
+59.24 448.6049999999999 Td
/F3.1 11 Tf
-<21> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -120683,9 +122306,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 753.585 Td
+59.24 433.8649999999999 Td
/F3.0 11 Tf
-<ca20202020202020202020> Tj
+<ca2020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -120694,9 +122317,9 @@ ET
0.200 0.400 0.600 SCN
BT
-119.74000000000001 753.585 Td
+141.74 433.8649999999999 Td
/F3.0 11 Tf
-<656c656d656e74466f726d44656661756c743d> Tj
+<736368656d614c6f636174696f6e3d> Tj
ET
0.000 0.000 0.000 SCN
@@ -120705,9 +122328,20 @@ ET
0.867 0.133 0.000 SCN
BT
-224.24 753.585 Td
+224.24 433.8649999999999 Td
/F3.0 11 Tf
-<227175616c696669656422> Tj
+<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e2f636f6d6d6f6e2d312e302e78736422> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+515.74 433.8649999999999 Td
+/F7.0 11 Tf
+<2f3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -120716,9 +122350,31 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 738.845 Td
+59.24 404.3849999999999 Td
/F3.0 11 Tf
-<ca20202020202020202020> Tj
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+81.24000000000001 404.3849999999999 Td
+/F7.0 11 Tf
+<3c78733a656c656d656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+141.74 404.3849999999999 Td
+/F3.0 11 Tf
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -120727,9 +122383,9 @@ ET
0.200 0.400 0.600 SCN
BT
-119.74000000000001 738.845 Td
+147.24 404.3849999999999 Td
/F3.0 11 Tf
-<786d6c6e733d> Tj
+<6e616d653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -120738,9 +122394,20 @@ ET
0.867 0.133 0.000 SCN
BT
-152.74 738.845 Td
+174.74 404.3849999999999 Td
/F3.0 11 Tf
-<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e22> Tj
+<22616374696f6e496e766f636174696f6e4d656d656e746f44746f22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+328.74 404.3849999999999 Td
+/F7.0 11 Tf
+<3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -120749,31 +122416,51 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 724.105 Td
-/F3.0 11 Tf
-<ca20202020202020202020> Tj
+59.24 389.64499999999987 Td
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-119.74000000000001 724.105 Td
+59.24 389.64499999999987 Td
+/F3.1 11 Tf
+<23> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 374.90499999999986 Td
/F3.0 11 Tf
-<786d6c6e733a78733d> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
BT
-169.24 724.105 Td
+103.24000000000001 374.90499999999986 Td
+/F7.0 11 Tf
+<3c78733a636f6d706c6578547970653e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 360.16499999999985 Td
/F3.0 11 Tf
-<22687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d6122> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -120782,9 +122469,9 @@ ET
0.733 0.000 0.400 SCN
BT
-356.24 724.105 Td
+125.24000000000001 360.16499999999985 Td
/F7.0 11 Tf
-<3e> Tj
+<3c78733a73657175656e63653e> Tj
ET
0.000 0.000 0.000 SCN
@@ -120793,9 +122480,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+59.24 345.42499999999984 Td
/F3.0 11 Tf
-<ca202020> Tj
+<ca202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -120804,9 +122491,9 @@ ET
0.733 0.000 0.400 SCN
BT
-81.24000000000001 694.625 Td
+147.24 345.42499999999984 Td
/F7.0 11 Tf
-<3c78733a636f6d706c657854797065> Tj
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -120815,7 +122502,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 694.625 Td
+207.74 345.42499999999984 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -120826,7 +122513,7 @@ ET
0.200 0.400 0.600 SCN
BT
-169.24 694.625 Td
+213.24 345.42499999999984 Td
/F3.0 11 Tf
<6e616d653d> Tj
ET
@@ -120837,9 +122524,9 @@ ET
0.867 0.133 0.000 SCN
BT
-196.74 694.625 Td
+240.74 345.42499999999984 Td
/F3.0 11 Tf
-<226f696444746f22> Tj
+<226d6574616461746122> Tj
ET
0.000 0.000 0.000 SCN
@@ -120848,7 +122535,7 @@ ET
0.733 0.000 0.400 SCN
BT
-240.74 694.625 Td
+295.74 345.42499999999984 Td
/F7.0 11 Tf
<3e> Tj
ET
@@ -120859,18 +122546,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 679.885 Td
+59.24 330.6849999999999 Td
+/F3.0 11 Tf
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
BT
-59.24 679.885 Td
-/F3.1 11 Tf
-<22> Tj
+169.24 330.6849999999999 Td
+/F7.0 11 Tf
+<3c78733a636f6d706c6578547970653e> Tj
ET
0.000 0.000 0.000 SCN
@@ -120879,9 +122568,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 665.145 Td
+59.24 315.9449999999999 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<ca2020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -120890,7 +122579,7 @@ ET
0.733 0.000 0.400 SCN
BT
-103.24000000000001 665.145 Td
+191.24 315.9449999999999 Td
/F7.0 11 Tf
<3c78733a73657175656e63653e> Tj
ET
@@ -120901,9 +122590,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 650.405 Td
+59.24 301.20499999999987 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -120912,7 +122601,7 @@ ET
0.733 0.000 0.400 SCN
BT
-125.24000000000001 650.405 Td
+213.24 301.20499999999987 Td
/F7.0 11 Tf
<3c78733a656c656d656e74> Tj
ET
@@ -120923,7 +122612,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 650.405 Td
+273.74 301.20499999999987 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -120934,7 +122623,7 @@ ET
0.200 0.400 0.600 SCN
BT
-191.24 650.405 Td
+279.24 301.20499999999987 Td
/F3.0 11 Tf
<6e616d653d> Tj
ET
@@ -120945,9 +122634,9 @@ ET
0.867 0.133 0.000 SCN
BT
-218.74 650.405 Td
+306.74 301.20499999999987 Td
/F3.0 11 Tf
-<226f626a6563745479706522> Tj
+<227472616e73616374696f6e496422> Tj
ET
0.000 0.000 0.000 SCN
@@ -120956,7 +122645,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 650.405 Td
+389.24 301.20499999999987 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -120967,7 +122656,7 @@ ET
0.200 0.400 0.600 SCN
BT
-290.24 650.405 Td
+394.74 301.20499999999987 Td
/F3.0 11 Tf
<747970653d> Tj
ET
@@ -120978,7 +122667,7 @@ ET
0.867 0.133 0.000 SCN
BT
-317.74 650.405 Td
+422.24 301.20499999999987 Td
/F3.0 11 Tf
<2278733a737472696e6722> Tj
ET
@@ -120989,7 +122678,7 @@ ET
0.733 0.000 0.400 SCN
BT
-378.24 650.405 Td
+482.74 301.20499999999987 Td
/F7.0 11 Tf
<2f3e> Tj
ET
@@ -121000,7 +122689,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 635.665 Td
+59.24 286.46499999999986 Td
ET
0.000 0.000 0.000 SCN
@@ -121009,9 +122698,9 @@ ET
0.694 0.129 0.275 SCN
BT
-59.24 635.665 Td
+59.24 286.46499999999986 Td
/F3.1 11 Tf
-<23> Tj
+<24> Tj
ET
0.000 0.000 0.000 SCN
@@ -121020,9 +122709,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 620.925 Td
+59.24 271.72499999999985 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -121031,7 +122720,7 @@ ET
0.733 0.000 0.400 SCN
BT
-125.24000000000001 620.925 Td
+213.24 271.72499999999985 Td
/F7.0 11 Tf
<3c78733a656c656d656e74> Tj
ET
@@ -121042,7 +122731,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 620.925 Td
+273.74 271.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121053,7 +122742,7 @@ ET
0.200 0.400 0.600 SCN
BT
-191.24 620.925 Td
+279.24 271.72499999999985 Td
/F3.0 11 Tf
<6e616d653d> Tj
ET
@@ -121064,9 +122753,9 @@ ET
0.867 0.133 0.000 SCN
BT
-218.74 620.925 Td
+306.74 271.72499999999985 Td
/F3.0 11 Tf
-<226f626a6563744964656e74696669657222> Tj
+<2273657175656e636522> Tj
ET
0.000 0.000 0.000 SCN
@@ -121075,7 +122764,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 620.925 Td
+361.74 271.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121086,7 +122775,7 @@ ET
0.200 0.400 0.600 SCN
BT
-323.24 620.925 Td
+367.24 271.72499999999985 Td
/F3.0 11 Tf
<747970653d> Tj
ET
@@ -121097,9 +122786,9 @@ ET
0.867 0.133 0.000 SCN
BT
-350.74 620.925 Td
+394.74 271.72499999999985 Td
/F3.0 11 Tf
-<2278733a737472696e6722> Tj
+<2278733a696e7422> Tj
ET
0.000 0.000 0.000 SCN
@@ -121108,7 +122797,7 @@ ET
0.733 0.000 0.400 SCN
BT
-411.24 620.925 Td
+438.74 271.72499999999985 Td
/F7.0 11 Tf
<2f3e> Tj
ET
@@ -121119,7 +122808,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 606.185 Td
+59.24 256.98499999999984 Td
ET
0.000 0.000 0.000 SCN
@@ -121128,9 +122817,9 @@ ET
0.694 0.129 0.275 SCN
BT
-59.24 606.185 Td
+59.24 256.98499999999984 Td
/F3.1 11 Tf
-<24> Tj
+<25> Tj
ET
0.000 0.000 0.000 SCN
@@ -121139,9 +122828,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 591.4449999999999 Td
+59.24 242.24499999999983 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -121150,9 +122839,9 @@ ET
0.733 0.000 0.400 SCN
BT
-103.24000000000001 591.4449999999999 Td
+213.24 242.24499999999983 Td
/F7.0 11 Tf
-<3c2f78733a73657175656e63653e> Tj
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -121161,20 +122850,31 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 576.7049999999999 Td
+273.74 242.24499999999983 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
BT
-103.24000000000001 576.7049999999999 Td
-/F7.0 11 Tf
-<3c78733a617474726962757465> Tj
+279.24 242.24499999999983 Td
+/F3.0 11 Tf
+<6e616d653d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+306.74 242.24499999999983 Td
+/F3.0 11 Tf
+<2274696d657374616d7022> Tj
ET
0.000 0.000 0.000 SCN
@@ -121183,7 +122883,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 576.7049999999999 Td
+367.24 242.24499999999983 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121194,9 +122894,9 @@ ET
0.200 0.400 0.600 SCN
BT
-180.24 576.7049999999999 Td
+372.74 242.24499999999983 Td
/F3.0 11 Tf
-<6e616d653d> Tj
+<747970653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121205,9 +122905,20 @@ ET
0.867 0.133 0.000 SCN
BT
-207.74 576.7049999999999 Td
+400.24 242.24499999999983 Td
/F3.0 11 Tf
-<226f626a656374537461746522> Tj
+<2278733a6461746554696d6522> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+471.74 242.24499999999983 Td
+/F7.0 11 Tf
+<2f3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -121216,7 +122927,49 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 576.7049999999999 Td
+59.24 227.50499999999982 Td
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+59.24 227.50499999999982 Td
+/F3.1 11 Tf
+<26> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 212.76499999999982 Td
+/F3.0 11 Tf
+<ca202020202020202020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+213.24 212.76499999999982 Td
+/F7.0 11 Tf
+<3c78733a656c656d656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+273.74 212.76499999999982 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121227,9 +122980,9 @@ ET
0.200 0.400 0.600 SCN
BT
-284.74 576.7049999999999 Td
+279.24 212.76499999999982 Td
/F3.0 11 Tf
-<747970653d> Tj
+<6e616d653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121238,9 +122991,9 @@ ET
0.867 0.133 0.000 SCN
BT
-312.24 576.7049999999999 Td
+306.74 212.76499999999982 Td
/F3.0 11 Tf
-<22626f6f6b6d61726b4f626a656374537461746522> Tj
+<2274617267657422> Tj
ET
0.000 0.000 0.000 SCN
@@ -121249,7 +123002,9 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 576.7049999999999 Td
+350.74 212.76499999999982 Td
+/F3.0 11 Tf
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -121258,9 +123013,9 @@ ET
0.200 0.400 0.600 SCN
BT
-59.24 561.9649999999999 Td
+356.24 212.76499999999982 Td
/F3.0 11 Tf
-<64656661756c743d> Tj
+<747970653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121269,9 +123024,9 @@ ET
0.867 0.133 0.000 SCN
BT
-103.24000000000001 561.9649999999999 Td
+383.74 212.76499999999982 Td
/F3.0 11 Tf
-<2270657273697374656e7422> Tj
+<22636f6d6d6f6e3a6f696444746f22> Tj
ET
0.000 0.000 0.000 SCN
@@ -121280,7 +123035,7 @@ ET
0.733 0.000 0.400 SCN
BT
-169.24 561.9649999999999 Td
+466.24 212.76499999999982 Td
/F7.0 11 Tf
<2f3e> Tj
ET
@@ -121291,20 +123046,18 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 547.2249999999999 Td
-/F3.0 11 Tf
-<ca202020> Tj
+59.24 198.0249999999998 Td
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-81.24000000000001 547.2249999999999 Td
-/F7.0 11 Tf
-<3c2f78733a636f6d706c6578547970653e> Tj
+59.24 198.0249999999998 Td
+/F3.1 11 Tf
+<27> Tj
ET
0.000 0.000 0.000 SCN
@@ -121313,9 +123066,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 517.7449999999999 Td
+59.24 183.2849999999998 Td
/F3.0 11 Tf
-<ca202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -121324,9 +123077,9 @@ ET
0.733 0.000 0.400 SCN
BT
-81.24000000000001 517.7449999999999 Td
+213.24 183.2849999999998 Td
/F7.0 11 Tf
-<3c78733a73696d706c6554797065> Tj
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -121335,7 +123088,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 517.7449999999999 Td
+273.74 183.2849999999998 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121346,7 +123099,7 @@ ET
0.200 0.400 0.600 SCN
BT
-163.74 517.7449999999999 Td
+279.24 183.2849999999998 Td
/F3.0 11 Tf
<6e616d653d> Tj
ET
@@ -121357,9 +123110,42 @@ ET
0.867 0.133 0.000 SCN
BT
-191.24 517.7449999999999 Td
+306.74 183.2849999999998 Td
/F3.0 11 Tf
-<22626f6f6b6d61726b4f626a656374537461746522> Tj
+<22746172676574436c61737322> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+378.24 183.2849999999998 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+383.74 183.2849999999998 Td
+/F3.0 11 Tf
+<747970653d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+411.24 183.2849999999998 Td
+/F3.0 11 Tf
+<2278733a737472696e6722> Tj
ET
0.000 0.000 0.000 SCN
@@ -121368,9 +123154,9 @@ ET
0.733 0.000 0.400 SCN
BT
-306.74 517.7449999999999 Td
+471.74 183.2849999999998 Td
/F7.0 11 Tf
-<3e> Tj
+<2f3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -121379,7 +123165,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 503.00499999999994 Td
+59.24 168.5449999999998 Td
ET
0.000 0.000 0.000 SCN
@@ -121388,9 +123174,9 @@ ET
0.694 0.129 0.275 SCN
BT
-59.24 503.00499999999994 Td
+59.24 168.5449999999998 Td
/F3.1 11 Tf
-<25> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -121399,9 +123185,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 488.26499999999993 Td
+59.24 153.80499999999978 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -121410,9 +123196,9 @@ ET
0.733 0.000 0.400 SCN
BT
-103.24000000000001 488.26499999999993 Td
+213.24 153.80499999999978 Td
/F7.0 11 Tf
-<3c78733a7265737472696374696f6e> Tj
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -121421,7 +123207,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 488.26499999999993 Td
+273.74 153.80499999999978 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121432,9 +123218,9 @@ ET
0.200 0.400 0.600 SCN
BT
-191.24 488.26499999999993 Td
+279.24 153.80499999999978 Td
/F3.0 11 Tf
-<626173653d> Tj
+<6e616d653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121443,7 +123229,40 @@ ET
0.867 0.133 0.000 SCN
BT
-218.74 488.26499999999993 Td
+306.74 153.80499999999978 Td
+/F3.0 11 Tf
+<22746172676574416374696f6e22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+383.74 153.80499999999978 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+389.24 153.80499999999978 Td
+/F3.0 11 Tf
+<747970653d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+416.74 153.80499999999978 Td
/F3.0 11 Tf
<2278733a737472696e6722> Tj
ET
@@ -121454,9 +123273,9 @@ ET
0.733 0.000 0.400 SCN
BT
-279.24 488.26499999999993 Td
+477.24 153.80499999999978 Td
/F7.0 11 Tf
-<3e> Tj
+<2f3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -121465,9 +123284,29 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 473.5249999999999 Td
+59.24 139.06499999999977 Td
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+59.24 139.06499999999977 Td
+/F3.1 11 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 124.32499999999976 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -121476,9 +123315,9 @@ ET
0.733 0.000 0.400 SCN
BT
-125.24000000000001 473.5249999999999 Td
+213.24 124.32499999999976 Td
/F7.0 11 Tf
-<3c78733a656e756d65726174696f6e> Tj
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -121487,7 +123326,40 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 473.5249999999999 Td
+273.74 124.32499999999976 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
+
+BT
+279.24 124.32499999999976 Td
+/F3.0 11 Tf
+<6e616d653d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
+
+BT
+306.74 124.32499999999976 Td
+/F3.0 11 Tf
+<22616374696f6e4964656e74696669657222> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+405.74 124.32499999999976 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121498,9 +123370,9 @@ ET
0.200 0.400 0.600 SCN
BT
-213.24 473.5249999999999 Td
+411.24 124.32499999999976 Td
/F3.0 11 Tf
-<76616c75653d> Tj
+<747970653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121509,9 +123381,9 @@ ET
0.867 0.133 0.000 SCN
BT
-246.24 473.5249999999999 Td
+438.74 124.32499999999976 Td
/F3.0 11 Tf
-<2270657273697374656e7422> Tj
+<2278733a737472696e6722> Tj
ET
0.000 0.000 0.000 SCN
@@ -121520,7 +123392,7 @@ ET
0.733 0.000 0.400 SCN
BT
-312.24 473.5249999999999 Td
+499.24 124.32499999999976 Td
/F7.0 11 Tf
<2f3e> Tj
ET
@@ -121531,20 +123403,18 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 458.7849999999999 Td
-/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+59.24 109.58499999999975 Td
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-125.24000000000001 458.7849999999999 Td
-/F7.0 11 Tf
-<3c78733a656e756d65726174696f6e> Tj
+59.24 109.58499999999975 Td
+/F3.1 11 Tf
+<2a> Tj
ET
0.000 0.000 0.000 SCN
@@ -121553,64 +123423,53 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 458.7849999999999 Td
+59.24 94.84499999999974 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
BT
-213.24 458.7849999999999 Td
-/F3.0 11 Tf
-<76616c75653d> Tj
+213.24 94.84499999999974 Td
+/F7.0 11 Tf
+<3c78733a656c656d656e74> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-246.24 458.7849999999999 Td
+273.74 94.84499999999974 Td
/F3.0 11 Tf
-<227472616e7369656e7422> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
-
-BT
-306.74 458.7849999999999 Td
-/F7.0 11 Tf
-<2f3e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
BT
-59.24 444.0449999999999 Td
+279.24 94.84499999999974 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<6e616d653d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.867 0.133 0.000 scn
+0.867 0.133 0.000 SCN
BT
-125.24000000000001 444.0449999999999 Td
-/F7.0 11 Tf
-<3c78733a656e756d65726174696f6e> Tj
+306.74 94.84499999999974 Td
+/F3.0 11 Tf
+<227573657222> Tj
ET
0.000 0.000 0.000 SCN
@@ -121619,7 +123478,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 444.0449999999999 Td
+339.74 94.84499999999974 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -121630,9 +123489,9 @@ ET
0.200 0.400 0.600 SCN
BT
-213.24 444.0449999999999 Td
+345.24 94.84499999999974 Td
/F3.0 11 Tf
-<76616c75653d> Tj
+<747970653d> Tj
ET
0.000 0.000 0.000 SCN
@@ -121641,9 +123500,9 @@ ET
0.867 0.133 0.000 SCN
BT
-246.24 444.0449999999999 Td
+372.74 94.84499999999974 Td
/F3.0 11 Tf
-<22766965774d6f64656c22> Tj
+<2278733a737472696e6722> Tj
ET
0.000 0.000 0.000 SCN
@@ -121652,7 +123511,7 @@ ET
0.733 0.000 0.400 SCN
BT
-306.74 444.0449999999999 Td
+433.24 94.84499999999974 Td
/F7.0 11 Tf
<2f3e> Tj
ET
@@ -121663,20 +123522,18 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 429.3049999999999 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
+59.24 80.10499999999973 Td
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000
<TRUNCATED>
[6/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgcms.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.html b/content/guides/rgcms.html
index 0c5e321..de086f0 100644
--- a/content/guides/rgcms.html
+++ b/content/guides/rgcms.html
@@ -5243,7 +5243,7 @@ a reference to the JDO <code>PersistenceManagerFactory</code>.</p>
also possible to extend the layout architecture for other grid systems. The component classes, though, are intended to be reusable across all grid systems.</p>
</div>
<div class="paragraph">
-<p>The component classes, meanwhile, are broadly equivalent to the "layout" annotations (<a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>, <a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a> and <a href="rgant.html#_rgant_DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
+<p>The component classes, meanwhile, are broadly equivalent to the "layout" annotations (<a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>, <a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a> and <a href="rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
</div>
<div class="paragraph">
<p>All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (the <code>component</code> classes in the <code><a href="http://isis.apache.org/applib/layout/component" class="bare">http://isis.apache.org/applib/layout/component</a></code> XSD namespace, the bootstrap 3 grid classes in the <code><a href="http://isis.apache.org/applib/layout/grid/bootstrap3" class="bare">http://isis.apache.org/applib/layout/grid/bootstrap3</a></code> XSD namespace). This ability to serialize to/from XML is used by the <a href="rgsvc.html#_rgsvc_spi_GridLoaderService"><code>GridLoaderService</code></a>, the default implementation of which reads the grid layout for a domain class from a <code>.layout.xml</code> file on the classpath.</p>
@@ -5267,16 +5267,16 @@ also possible to extend the layout architecture for other grid systems. The com
<div class="ulist">
<ul>
<li>
-<p><code>PropertyLayoutData</code>, corresponding to the <a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> annotation;</p>
+<p><code>PropertyLayoutData</code>, corresponding to the <a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a> annotation;</p>
</li>
<li>
-<p><code>CollectionLayoutData</code>, corresponding to the <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a> annotation;</p>
+<p><code>CollectionLayoutData</code>, corresponding to the <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a> annotation;</p>
</li>
<li>
-<p><code>ActionLayoutData</code>, corresponding to the <a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a> annotation;</p>
+<p><code>ActionLayoutData</code>, corresponding to the <a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a> annotation;</p>
</li>
<li>
-<p><code>DomainObjectLayoutData</code>, corresponding to the <a href="rgant.html#_rgant_DomainObjectLayout"><code>@DomainObjectLayout</code></a> annotation.</p>
+<p><code>DomainObjectLayoutData</code>, corresponding to the <a href="rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a> annotation.</p>
</li>
</ul>
</div>
@@ -5365,163 +5365,85 @@ responsive designs.</p>
<div class="sectionbody">
<div class="paragraph">
<p>Most applications need to integrate with other apps in the enterprise. To facilitate such integration scenarios,
-Apache Isis defines two standard XSD schemas:</p>
+Apache Isis defines a number of standard XSD schemas:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p>the <a href="#_rgcms_schema-common">common schema</a>, which defines the <code>oidDto</code> complex type: the object’s type and its identifier.<br></p>
-<div class="paragraph">
-<p>It also defines some two further XSD types, which are building blocks used in…​</p>
-</div>
+<p>the <a href="#_rgcms_schema-cmd">command</a> schema (<code>1.13.0-SNAPSHOT</code>), which captures the <em>intention</em> of a user
+to invoke an action or edit a property</p>
</li>
<li>
-<p>the <a href="#_rgcms_schema-aim">action memento invocation</a> schema, which allows action invocations to be captured
-and reified.<br></p>
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module uses this XML format
-to publish messages onto an <a href="http://activemq.apache.org">Apache ActiveMQ</a> message queue.</p>
-</div>
+<p>the <a href="#_rgcms_schema-ixn">interaction execution</a> schema (<code>1.13.0-SNAPSHOT</code>), which captures the actual execution of an action invocation/property edit</p>
+</li>
+<li>
+<p>the <a href="#_rgcms_schema-chg">changes</a> schema (<code>1.13.0-SNAPSHOT</code>), which captures which objects have been
+created, updated or deleted as the result of an execution of an action invocation/property edit</p>
+</li>
+<li>
+<p>the <a href="#_rgcms_schema-aim">action memento invocation</a> schema (deprecated in <code>1.13.0-SNAPSHOT</code>, replaced by
+either "cmd" or "ixn"), which allows action invocations to be captured and reified.</p>
</li>
</ul>
</div>
<div class="paragraph">
-<p>The sections below discuss these schemas in more detail.</p>
+<p>These each use XSD types defined by the <a href="#_rgcms_schema-common">common schema</a> (most notably the <code>oidDto</code>
+complex type which identifies a domain object).</p>
</div>
-<div class="sect2">
-<h3 id="_rgcms_schema-common">4.1. Common Schema</h3>
<div class="paragraph">
-<p>The main purpose of the common schema is to define the <code>oidDto</code> complex type: the object’s type and its identifier.
-This is basically a formal XML equivalent to the <code>Bookmark</code> object obtained from the
-<a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>.</p>
+<p>(As of <code>1.13.0-SNAPSHOT</code>) the (non-ASF) <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> and
+<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> modules uses these schemas to reify
+corresponding applib objects (<code>Command</code>, <code>Interaction.Execution</code> and <code>PublishedObjects</code>), either to persist or
+publishing using an <a href="http://activemq.apache.org">Apache ActiveMQ</a> message queue.</p>
</div>
<div class="paragraph">
-<p>Although simple, this is an enormously powerful concept, in that it represents a URI to any domain object managed by
-a given Apache Isis application. With it, we have the ability to lookup any arbitrary object. Further discussion and
-examples can be found <a href="ugfun.html#_ugfun_core-concepts_building-blocks_oid">here</a>.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><xs:schema</span> <span class="attribute-name">targetNamespace</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="attribute-name">elementFormDefault</span>=<span class="string"><span class="delimiter">"</span><span class="content">qualified</span><span class="delimiter">"</span></span>
- <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
- <span class="attribute-name">xmlns:xs</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema</span><span class="delimiter">"</span></span><span class="tag">></span>
-
- <span class="tag"><xs:complexType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">oidDto</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="tag"><xs:sequence></span>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectType</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span> <i class="conum" data-value="3"></i><b>(3)</b>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectIdentifier</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span> <i class="conum" data-value="4"></i><b>(4)</b>
- <span class="tag"></xs:sequence></span>
- <span class="tag"><xs:attribute</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectState</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">bookmarkObjectState</span><span class="delimiter">"</span></span> <span class="attribute-name">default</span>=<span class="string"><span class="delimiter">"</span><span class="content">persistent</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"></xs:complexType></span>
-
- <span class="tag"><xs:simpleType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">bookmarkObjectState</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="5"></i><b>(5)</b>
- <span class="tag"><xs:restriction</span> <span class="attribute-name">base</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">persistent</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">transient</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">viewModel</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"></xs:restriction></span>
- <span class="tag"></xs:simpleType></span>
- ...
-<span class="tag"></xs:schema></span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the common schema has a namespace URI of "http://isis.apache.org/schema/common". Although URIs are not the same as URLs, you will find that the schemas are also downloadable from this location.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>the <code>oidDto</code> complex type defines the unique identifier for any domain object: its type, and an identifier. The <code>objectState</code> attribute is of type <code>bookmarkObjectState</code> and will typically be "transient" or "viewModel"</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>the object type, corresponding to either the
-<a href="rgant.html#_rgant-DomainObject_objectType"><code>@DomainObject#objectType()</code></a> attribute, or to the (JDO)
-<a href="rgant.html#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a> annotation (<code>schema</code> and/or <code>table</code>
-attributes), or to the (JDO) <a href="rgant.html#_rgant-Discriminator"><code>@Discriminator</code></a> annotation. If none
-is specified, then the fully
-qualified class name will be used.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>the object identifier (aka primary key), converted to string form.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>the <code>bookmarkObjectState</code> enumerates the possible persistence states of the referenced object. Although "transient" is shown,
-in practice the only types of objects will be "persistent" (entities) or "viewModel".</td>
-</tr>
-</table>
+<p>The sections below discuss these schemas in more detail.</p>
</div>
+<div class="sect2">
+<h3 id="_rgcms_schema-cmd">4.1. Command (<code>1.13.0-SNAPSHOT</code>)</h3>
<div class="paragraph">
-<p>The <code>oidDto</code> complex type is used in two specific places by the framework:</p>
+<p>The "cmd" schema (<code>1.13.0-SNAPSHOT</code>) defines the serialized form of the <em>intention</em> to invoke an action or to
+edit a property.</p>
</div>
-<div class="ulist">
-<ul>
-<li>
-<p>first, as a means of serializing JAXB view model/DTOs (annotated with
-<a href="rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>), that reference domain entities.<br></p>
-<div class="paragraph">
-<p>These references are serialized instead into OIDs</p>
</div>
-</li>
-<li>
-<p>second, as references to the target of action invocations, as described by the
-<a href="#_rgcms_schema-aim">action invocation memento</a> schema.<br></p>
+<div class="sect2">
+<h3 id="_rgcms_schema-ixn">4.2. Interaction Execution (<code>1.13.0-SNAPSHOT</code>)</h3>
<div class="paragraph">
-<p>They are also used to represent references to any action arguments that take domain object entities.</p>
+<p>The "ixn" schema (<code>1.13.0-SNAPSHOT</code>) defines the serialized form of an action invocation or a property edit. In fact,
+it actually defines a callgraph of such executions for those cases where the
+<a href="rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> is used to execute sub-actions/property edits.</p>
</div>
-</li>
-</ul>
</div>
+<div class="sect2">
+<h3 id="_rgcms_schema-chg">4.3. Changes (<code>1.13.0-SNAPSHOT</code>)</h3>
<div class="paragraph">
-<p>The common schema also defines two further types: the <code>valueDto</code> complex type and the <code>valueType</code> simple type:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><xs:schema</span> <span class="attribute-name">targetNamespace</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
- <span class="attribute-name">elementFormDefault</span>=<span class="string"><span class="delimiter">"</span><span class="content">qualified</span><span class="delimiter">"</span></span>
- <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
- <span class="attribute-name">xmlns:xs</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema</span><span class="delimiter">"</span></span><span class="tag">></span>
- ...
- <span class="tag"><xs:complexType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">valueDto</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="tag"><xs:choice</span> <span class="attribute-name">minOccurs</span>=<span class="string"><span class="delimiter">"</span><span class="content">0</span><span class="delimiter">"</span></span> <span class="attribute-name">maxOccurs</span>=<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span><span class="tag">></span>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">string</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">byte</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:byte</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">short</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:short</span><span class="delimiter">"</span></span><span class="tag">/></span>
- ...
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">localTime</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:time</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">oidDto</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"></xs:choice></span>
- <span class="tag"></xs:complexType></span>
-
- <span class="tag"><xs:simpleType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">valueType</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="tag"><xs:restriction</span> <span class="attribute-name">base</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">string</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">byte</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">short</span><span class="delimiter">"</span></span><span class="tag">/></span>
- ...
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">isisApplibClob</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span><span class="tag">/></span>
- <span class="tag"></xs:restriction></span>
- <span class="tag"></xs:simpleType></span>
-<span class="tag"></xs:schema></span></code></pre>
+<p>The "chg" schema (<code>1.13.0-SNAPSHOT</code>) defines the serialized form identifying which objects have been created, updated
+or deleted as the result of invoking an action or editing a property.</p>
</div>
</div>
+<div class="sect2">
+<h3 id="_rgcms_schema-aim">4.4. Action Invocation Memento</h3>
<div class="paragraph">
-<p>These two type definitions are just building blocks, also used within the
-<a href="#_rgcms_schema-aim">action iInvocation memento</a> schema. The first, <code>valueDto</code> is intended to hold any valid
-value, eg of an argument to an action. The second, <code>valueType</code>, enumerates the different types of vales, eg of a
-formal parameter to an action.</p>
+<p>The "aim" schema defines the serialized form (or memento) of an action invocation.</p>
</div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>This schema has been removed in <code>1.13.0-SNAPSHOT</code>, replaced with <a href="#_rgcms_schema-ixn">ixn.xsd</a> (for action
+invocations/property edits) and with <a href="#_rgcms_schema-cmd">cmd.xsd</a> (commands, ie the <em>intention</em> to
+invoke an action/edit a property).</p>
</div>
-<div class="sect2">
-<h3 id="_rgcms_schema-aim">4.2. Action Invocation Memento</h3>
<div class="paragraph">
-<p>The "aim" schema defines the serialized form (or memento) of an action invocation.</p>
+<p>The remaining content on this page describes how <code>CommandContext</code> works up to v1.12.x. However, as of <code>1.13.0-SNAPSHOT</code> the <code>CommandContext</code> uses its own <code>cmd.xsd</code> schema).</p>
+</div>
+</td>
+</tr>
+</table>
</div>
<div class="paragraph">
<p>Action invocations are captured (in memory rather than in serialized form) when the end-user invokes the action
@@ -5670,14 +5592,144 @@ be serialized to/from using the same <code>ActionInvocationMementoDtoUtils</code
</td>
<td class="content">
<div class="paragraph">
-<p>As of <code>1.11.0</code> this schema is not used directly by the framework; in particular <code>Command#setMemento(…​)</code> sets a similar
-but less formal XML structure. This may change in the future.</p>
+<p>As of <code>1.11.0</code> through <code>1.12.1</code> this schema is not used directly by the framework; in particular
+<code>Command#setMemento(…​)</code> sets a similar but less formal XML structure. This may change in the future.</p>
</div>
</td>
</tr>
</table>
</div>
</div>
+<div class="sect2">
+<h3 id="_rgcms_schema-common">4.5. Common Schema</h3>
+<div class="paragraph">
+<p>The main purpose of the common schema is to define the <code>oidDto</code> complex type: the object’s type and its identifier.
+This is basically a formal XML equivalent to the <code>Bookmark</code> object obtained from the
+<a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>.</p>
+</div>
+<div class="paragraph">
+<p>Although simple, this is an enormously powerful concept, in that it represents a URI to any domain object managed by
+a given Apache Isis application. With it, we have the ability to lookup any arbitrary object. Further discussion and
+examples can be found <a href="ugfun.html#_ugfun_core-concepts_building-blocks_oid">here</a>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><xs:schema</span> <span class="attribute-name">targetNamespace</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="attribute-name">elementFormDefault</span>=<span class="string"><span class="delimiter">"</span><span class="content">qualified</span><span class="delimiter">"</span></span>
+ <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
+ <span class="attribute-name">xmlns:xs</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema</span><span class="delimiter">"</span></span><span class="tag">></span>
+
+ <span class="tag"><xs:complexType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">oidDto</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="tag"><xs:sequence></span>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectType</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span> <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectIdentifier</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span> <i class="conum" data-value="4"></i><b>(4)</b>
+ <span class="tag"></xs:sequence></span>
+ <span class="tag"><xs:attribute</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">objectState</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">bookmarkObjectState</span><span class="delimiter">"</span></span> <span class="attribute-name">default</span>=<span class="string"><span class="delimiter">"</span><span class="content">persistent</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"></xs:complexType></span>
+
+ <span class="tag"><xs:simpleType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">bookmarkObjectState</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="5"></i><b>(5)</b>
+ <span class="tag"><xs:restriction</span> <span class="attribute-name">base</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">persistent</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">transient</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">viewModel</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"></xs:restriction></span>
+ <span class="tag"></xs:simpleType></span>
+ ...
+<span class="tag"></xs:schema></span></code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>the common schema has a namespace URI of "http://isis.apache.org/schema/common". Although URIs are not the same as URLs, you will find that the schemas are also downloadable from this location.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>the <code>oidDto</code> complex type defines the unique identifier for any domain object: its type, and an identifier. The <code>objectState</code> attribute is of type <code>bookmarkObjectState</code> and will typically be "transient" or "viewModel"</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>the object type, corresponding to either the
+<a href="rgant.html#_rgant-DomainObject_objectType"><code>@DomainObject#objectType()</code></a> attribute, or to the (JDO)
+<a href="rgant.html#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a> annotation (<code>schema</code> and/or <code>table</code>
+attributes), or to the (JDO) <a href="rgant.html#_rgant-Discriminator"><code>@Discriminator</code></a> annotation. If none
+is specified, then the fully
+qualified class name will be used.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>the object identifier (aka primary key), converted to string form.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="5"></i><b>5</b></td>
+<td>the <code>bookmarkObjectState</code> enumerates the possible persistence states of the referenced object. Although "transient" is shown,
+in practice the only types of objects will be "persistent" (entities) or "viewModel".</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The <code>oidDto</code> complex type is used in two specific places by the framework:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>first, as a means of serializing JAXB view model/DTOs (annotated with
+<a href="rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>), that reference domain entities.<br></p>
+<div class="paragraph">
+<p>These references are serialized instead into OIDs</p>
+</div>
+</li>
+<li>
+<p>second, as references to the target of action invocations, as described by the
+<a href="#_rgcms_schema-aim">action invocation memento</a> schema.<br></p>
+<div class="paragraph">
+<p>They are also used to represent references to any action arguments that take domain object entities.</p>
+</div>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The common schema also defines two further types: the <code>valueDto</code> complex type and the <code>valueType</code> simple type:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><xs:schema</span> <span class="attribute-name">targetNamespace</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
+ <span class="attribute-name">elementFormDefault</span>=<span class="string"><span class="delimiter">"</span><span class="content">qualified</span><span class="delimiter">"</span></span>
+ <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>
+ <span class="attribute-name">xmlns:xs</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema</span><span class="delimiter">"</span></span><span class="tag">></span>
+ ...
+ <span class="tag"><xs:complexType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">valueDto</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="tag"><xs:choice</span> <span class="attribute-name">minOccurs</span>=<span class="string"><span class="delimiter">"</span><span class="content">0</span><span class="delimiter">"</span></span> <span class="attribute-name">maxOccurs</span>=<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span><span class="tag">></span>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">string</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">byte</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:byte</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">short</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:short</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ ...
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">localTime</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:time</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:element</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">oidDto</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"></xs:choice></span>
+ <span class="tag"></xs:complexType></span>
+
+ <span class="tag"><xs:simpleType</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">valueType</span><span class="delimiter">"</span></span><span class="tag">></span> <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="tag"><xs:restriction</span> <span class="attribute-name">base</span>=<span class="string"><span class="delimiter">"</span><span class="content">xs:string</span><span class="delimiter">"</span></span><span class="tag">></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">string</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">byte</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">short</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ ...
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">isisApplibClob</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"><xs:enumeration</span> <span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span><span class="tag">/></span>
+ <span class="tag"></xs:restriction></span>
+ <span class="tag"></xs:simpleType></span>
+<span class="tag"></xs:schema></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>These two type definitions are just building blocks, also used within the
+<a href="#_rgcms_schema-aim">action iInvocation memento</a> schema. The first, <code>valueDto</code> is intended to hold any valid
+value, eg of an argument to an action. The second, <code>valueType</code>, enumerates the different types of vales, eg of a
+formal parameter to an action.</p>
+</div>
+</div>
</div>
</div>
</div>
@@ -5936,8 +5988,11 @@ but less formal XML structure. This may change in the future.</p>
</li>
<li><a href="#_rgcms_schema">4. Schema</a>
<ul class="sectlevel2">
-<li><a href="#_rgcms_schema-common">4.1. Common Schema</a></li>
-<li><a href="#_rgcms_schema-aim">4.2. Action Invocation Memento</a></li>
+<li><a href="#_rgcms_schema-cmd">4.1. Command (<code>1.13.0-SNAPSHOT</code>)</a></li>
+<li><a href="#_rgcms_schema-ixn">4.2. Interaction Execution (<code>1.13.0-SNAPSHOT</code>)</a></li>
+<li><a href="#_rgcms_schema-chg">4.3. Changes (<code>1.13.0-SNAPSHOT</code>)</a></li>
+<li><a href="#_rgcms_schema-aim">4.4. Action Invocation Memento</a></li>
+<li><a href="#_rgcms_schema-common">4.5. Common Schema</a></li>
</ul>
</li>
</ul>
[2/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb.html b/content/guides/ugbtb.html
index c6b28fa..f2fb843 100644
--- a/content/guides/ugbtb.html
+++ b/content/guides/ugbtb.html
@@ -930,8 +930,8 @@ most powerful of all the various ways of writing view models:</p>
<li>
<p>their entire state (collections as well as properties) is automatically managed from interaction to interaction.<br></p>
<div class="paragraph">
-<p>In contrast, using <a href="rgant.html#_rgant_ViewModel"><code>@ViewModel</code></a> (or its
-<a href="rgant.html#_rgant_DomainObject_nature"><code>@DomainObject#nature()</code></a> equivalent) will only manage the state of
+<p>In contrast, using <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> (or its
+<a href="rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature()</code></a> equivalent) will only manage the state of
properties, but not collections. And if using the <a href="rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a>
interface, then the programmer must write all the state management (lots of boilerplate).</p>
</div>
@@ -1150,7 +1150,7 @@ namespace:</p>
xmlns = {
<span class="annotation">@javax</span>.xml.bind.annotation.XmlNs(
namespaceURI = <span class="string"><span class="delimiter">"</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">"</span></span>,
- prefix = <span class="string"><span class="delimiter">"</span><span class="content">common</span><span class="delimiter">"</span></span>
+ prefix = <span class="string"><span class="delimiter">"</span><span class="content">com</span><span class="delimiter">"</span></span>
)
},
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
@@ -2801,7 +2801,7 @@ msgstr "<i>Quantit�</i>"</code></pre>
<div class="paragraph">
<p>For this to work, the <code>namedEscaped()</code> attribute must be specified using either the
<a href="ugfun.html#_ugfun_object-layout_dynamic">dynamic layout</a> json file, or using an annotation such as
-<a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> or <a href="rgant.html#_rgant_ParameterLayout"><code>@ParameterLayout</code></a>.</p>
+<a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a> or <a href="rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a>.</p>
</div>
<div class="paragraph">
<p>For example:</p>
@@ -3505,7 +3505,7 @@ build up its metamodel.</p>
</td>
<td class="content">
<div class="paragraph">
-<p>The support for <a href="rgant.html#_rgant_aaa_deprecated">disallowing deprecated annotations</a> is also implemented using the metamodel validator.</p>
+<p>The support for <a href="rgant.html#_rgant-aaa_deprecated">disallowing deprecated annotations</a> is also implemented using the metamodel validator.</p>
</div>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb.pdf b/content/guides/ugbtb.pdf
index 38ba4f3..8437a7f 100644
--- a/content/guides/ugbtb.pdf
+++ b/content/guides/ugbtb.pdf
@@ -4,8 +4,8 @@
<< /Title (Beyond the Basics)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160426190507+01'00')
-/ModDate (D:20160426190507+01'00')
+/CreationDate (D:20160513191548+01'00')
+/ModDate (D:20160513191548+01'00')
>>
endobj
2 0 obj
@@ -8467,7 +8467,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ViewModel)
+/URI (rgant.pdf#_rgant-ViewModel)
>>
/Subtype /Link
/Rect [161.4771690340909 318.15599999999984 213.9771690340909 328.65599999999984]
@@ -8478,7 +8478,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_DomainObject_nature)
+/URI (rgant.pdf#_rgant-DomainObject_nature)
>>
/Subtype /Link
/Rect [254.4570431463068 318.15599999999984 369.95704314630683 328.65599999999984]
@@ -14362,7 +14362,7 @@ endobj
>>
endobj
121 0 obj
-<< /Length 37589
+<< /Length 37583
>>
stream
q
@@ -14931,7 +14931,7 @@ ET
BT
240.74 709.365 Td
/F4.0 11 Tf
-<22636f6d6d6f6e22> Tj
+<22636f6d22> Tj
ET
0.000 0.000 0.000 SCN
@@ -60647,7 +60647,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_PropertyLayout)
+/URI (rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
/Rect [225.669 698.4559999999999 304.419 708.9559999999999]
@@ -60658,7 +60658,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ParameterLayout)
+/URI (rgant.pdf#_rgant-ParameterLayout)
>>
/Subtype /Link
/Rect [320.86199999999997 698.4559999999999 404.86199999999997 708.9559999999999]
@@ -77200,7 +77200,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_aaa_deprecated)
+/URI (rgant.pdf#_rgant-aaa_deprecated)
>>
/Subtype /Link
/Rect [212.17827777777777 543.8200000000003 394.78285185185183 558.1000000000003]
@@ -109433,622 +109433,622 @@ xref
0000245838 00000 n
0000246061 00000 n
0000246267 00000 n
-0000283911 00000 n
-0000284184 00000 n
-0000284393 00000 n
-0000308933 00000 n
-0000309248 00000 n
-0000309305 00000 n
-0000309507 00000 n
-0000309713 00000 n
-0000309946 00000 n
-0000332363 00000 n
-0000332630 00000 n
-0000332838 00000 n
-0000333046 00000 n
-0000356204 00000 n
-0000356445 00000 n
-0000379337 00000 n
-0000379578 00000 n
-0000401211 00000 n
-0000401504 00000 n
-0000401550 00000 n
-0000401741 00000 n
-0000401798 00000 n
-0000402007 00000 n
-0000431331 00000 n
-0000431629 00000 n
-0000431833 00000 n
-0000431879 00000 n
-0000453419 00000 n
-0000453731 00000 n
-0000453788 00000 n
-0000453964 00000 n
-0000454194 00000 n
-0000454252 00000 n
-0000488065 00000 n
-0000488359 00000 n
-0000488584 00000 n
-0000488641 00000 n
-0000488864 00000 n
-0000508840 00000 n
-0000509147 00000 n
-0000509368 00000 n
-0000509595 00000 n
-0000509652 00000 n
-0000510086 00000 n
-0000510769 00000 n
-0000534918 00000 n
-0000535220 00000 n
-0000535266 00000 n
-0000535528 00000 n
-0000535761 00000 n
-0000535819 00000 n
-0000536032 00000 n
-0000550359 00000 n
-0000550708 00000 n
-0000550873 00000 n
-0000550919 00000 n
-0000551141 00000 n
-0000551361 00000 n
-0000551590 00000 n
-0000551799 00000 n
-0000551857 00000 n
-0000552038 00000 n
-0000552269 00000 n
-0000552472 00000 n
-0000552530 00000 n
-0000552754 00000 n
-0000580980 00000 n
-0000581319 00000 n
-0000581365 00000 n
-0000581589 00000 n
-0000581811 00000 n
-0000582025 00000 n
-0000582231 00000 n
-0000582434 00000 n
-0000582491 00000 n
-0000582664 00000 n
-0000582721 00000 n
-0000606725 00000 n
-0000606979 00000 n
-0000607025 00000 n
-0000646377 00000 n
-0000646704 00000 n
-0000646908 00000 n
-0000647113 00000 n
-0000647318 00000 n
-0000647529 00000 n
-0000647741 00000 n
-0000647953 00000 n
-0000666797 00000 n
-0000667160 00000 n
-0000667206 00000 n
-0000667421 00000 n
-0000667648 00000 n
-0000667876 00000 n
-0000668095 00000 n
-0000668303 00000 n
-0000668511 00000 n
-0000668695 00000 n
-0000668741 00000 n
-0000669043 00000 n
-0000669285 00000 n
-0000697111 00000 n
-0000697427 00000 n
-0000697651 00000 n
-0000697839 00000 n
-0000698047 00000 n
-0000698104 00000 n
-0000717295 00000 n
-0000717570 00000 n
-0000717616 00000 n
-0000717825 00000 n
-0000718043 00000 n
-0000718101 00000 n
-0000718159 00000 n
-0000718391 00000 n
-0000755637 00000 n
-0000755910 00000 n
-0000756117 00000 n
-0000781588 00000 n
-0000781890 00000 n
-0000782116 00000 n
-0000782174 00000 n
-0000782398 00000 n
-0000782456 00000 n
-0000782652 00000 n
-0000807833 00000 n
-0000808101 00000 n
-0000808158 00000 n
-0000829437 00000 n
-0000829696 00000 n
-0000829753 00000 n
-0000830179 00000 n
-0000830395 00000 n
-0000864408 00000 n
-0000864649 00000 n
-0000890258 00000 n
-0000890486 00000 n
-0000908723 00000 n
-0000908990 00000 n
-0000909047 00000 n
-0000909260 00000 n
-0000909460 00000 n
-0000934751 00000 n
-0000935050 00000 n
-0000935279 00000 n
-0000935337 00000 n
-0000956549 00000 n
-0000956878 00000 n
-0000957091 00000 n
-0000957288 00000 n
-0000957508 00000 n
-0000957566 00000 n
-0000958139 00000 n
-0000958197 00000 n
-0000958243 00000 n
-0000975499 00000 n
-0000975771 00000 n
-0000975828 00000 n
-0000976031 00000 n
-0000976088 00000 n
-0000976146 00000 n
-0000976204 00000 n
-0000988457 00000 n
-0000988711 00000 n
-0000988757 00000 n
-0000988814 00000 n
-0001021159 00000 n
-0001021507 00000 n
-0001021553 00000 n
-0001021727 00000 n
-0001021913 00000 n
-0001022109 00000 n
-0001022330 00000 n
-0001022387 00000 n
-0001022653 00000 n
-0001022915 00000 n
-0001023176 00000 n
-0001040807 00000 n
-0001041144 00000 n
-0001041190 00000 n
-0001041374 00000 n
-0001041577 00000 n
-0001041778 00000 n
-0001041992 00000 n
-0001060281 00000 n
-0001064238 00000 n
-0001071194 00000 n
-0001071518 00000 n
-0001071575 00000 n
-0001071791 00000 n
-0001072004 00000 n
-0001072226 00000 n
-0001072449 00000 n
-0001072682 00000 n
-0001072895 00000 n
-0001100605 00000 n
-0001104174 00000 n
-0001105037 00000 n
-0001105290 00000 n
-0001127938 00000 n
-0001128239 00000 n
-0001128285 00000 n
-0001128342 00000 n
-0001128555 00000 n
-0001128778 00000 n
-0001129010 00000 n
-0001142602 00000 n
-0001142898 00000 n
-0001143060 00000 n
-0001143106 00000 n
-0001143316 00000 n
-0001143362 00000 n
-0001143586 00000 n
-0001143644 00000 n
-0001143701 00000 n
-0001143946 00000 n
-0001144004 00000 n
-0001144714 00000 n
-0001157030 00000 n
-0001157345 00000 n
-0001157573 00000 n
-0001157619 00000 n
-0001157842 00000 n
-0001157899 00000 n
-0001158128 00000 n
-0001180297 00000 n
-0001180538 00000 n
-0001210340 00000 n
-0001210644 00000 n
-0001210846 00000 n
-0001211035 00000 n
-0001211092 00000 n
-0001211260 00000 n
-0001211494 00000 n
-0001211719 00000 n
-0001243453 00000 n
-0001243708 00000 n
-0001245173 00000 n
-0001245415 00000 n
-0001263017 00000 n
-0001263332 00000 n
-0001263378 00000 n
-0001263435 00000 n
-0001263654 00000 n
-0001263821 00000 n
-0001263878 00000 n
-0001263936 00000 n
-0001264156 00000 n
-0001264214 00000 n
-0001291930 00000 n
-0001292198 00000 n
-0001292255 00000 n
-0001292313 00000 n
-0001308167 00000 n
-0001308524 00000 n
-0001308570 00000 n
-0001309317 00000 n
-0001309612 00000 n
-0001309925 00000 n
-0001310241 00000 n
-0001310550 00000 n
-0001310870 00000 n
-0001311185 00000 n
-0001311534 00000 n
-0001311898 00000 n
-0001312198 00000 n
-0001312256 00000 n
-0001312580 00000 n
-0001329516 00000 n
-0001329849 00000 n
-0001329895 00000 n
-0001330237 00000 n
-0001330553 00000 n
-0001330789 00000 n
-0001330971 00000 n
-0001331029 00000 n
-0001331362 00000 n
-0001331420 00000 n
-0001331623 00000 n
-0001331817 00000 n
-0001345537 00000 n
-0001345830 00000 n
-0001346049 00000 n
-0001346275 00000 n
-0001346332 00000 n
-0001346390 00000 n
-0001379816 00000 n
-0001380084 00000 n
-0001380141 00000 n
-0001403562 00000 n
-0001403842 00000 n
-0001403888 00000 n
-0001403945 00000 n
-0001404177 00000 n
-0001404409 00000 n
-0001426740 00000 n
-0001427054 00000 n
-0001427112 00000 n
-0001427169 00000 n
-0001427371 00000 n
-0001427428 00000 n
-0001427650 00000 n
-0001427862 00000 n
-0001445790 00000 n
-0001446102 00000 n
-0001446148 00000 n
-0001446366 00000 n
-0001446423 00000 n
-0001446647 00000 n
-0001446858 00000 n
-0001447070 00000 n
-0001447285 00000 n
-0001447495 00000 n
-0001447552 00000 n
-0001465795 00000 n
-0001466096 00000 n
-0001466362 00000 n
-0001466623 00000 n
-0001466668 00000 n
-0001466892 00000 n
-0001466950 00000 n
-0001478280 00000 n
-0001478573 00000 n
-0001478810 00000 n
-0001478856 00000 n
-0001479091 00000 n
-0001497829 00000 n
-0001498083 00000 n
-0001498141 00000 n
-0001515090 00000 n
-0001515378 00000 n
-0001515604 00000 n
-0001515662 00000 n
-0001515863 00000 n
-0001515920 00000 n
-0001516625 00000 n
-0001516851 00000 n
-0001516909 00000 n
-0001536778 00000 n
-0001537087 00000 n
-0001537144 00000 n
-0001537422 00000 n
-0001537480 00000 n
-0001537726 00000 n
-0001537960 00000 n
-0001538187 00000 n
-0001554229 00000 n
-0001554544 00000 n
-0001554765 00000 n
-0001554822 00000 n
-0001554879 00000 n
-0001555106 00000 n
-0001555163 00000 n
-0001555405 00000 n
-0001567000 00000 n
-0001567309 00000 n
-0001567355 00000 n
-0001567619 00000 n
-0001567884 00000 n
-0001567941 00000 n
-0001568137 00000 n
-0001568324 00000 n
-0001575967 00000 n
-0001576282 00000 n
-0001576328 00000 n
-0001576508 00000 n
-0001576693 00000 n
-0001576906 00000 n
-0001579374 00000 n
-0001580195 00000 n
-0001580400 00000 n
-0001614366 00000 n
-0001616731 00000 n
-0001616947 00000 n
-0001624546 00000 n
-0001624804 00000 n
-0001639336 00000 n
-0001640157 00000 n
-0001640359 00000 n
-0001655711 00000 n
-0001656532 00000 n
-0001664348 00000 n
-0001664645 00000 n
-0001664832 00000 n
-0001664889 00000 n
-0001664947 00000 n
-0001665867 00000 n
-0001665925 00000 n
-0001682778 00000 n
-0001683046 00000 n
-0001683104 00000 n
-0001697152 00000 n
-0001697406 00000 n
-0001697452 00000 n
-0001697498 00000 n
-0001697555 00000 n
-0001716763 00000 n
-0001717017 00000 n
-0001717074 00000 n
-0001717132 00000 n
-0001732080 00000 n
-0001732334 00000 n
-0001732391 00000 n
-0001732449 00000 n
-0001737862 00000 n
-0001738117 00000 n
-0001755081 00000 n
-0001755335 00000 n
-0001755392 00000 n
-0001755798 00000 n
-0001769126 00000 n
-0001769412 00000 n
-0001769623 00000 n
-0001769681 00000 n
-0001789062 00000 n
-0001789317 00000 n
-0001809455 00000 n
-0001809727 00000 n
-0001809785 00000 n
-0001809983 00000 n
-0001820287 00000 n
-0001820541 00000 n
-0001820587 00000 n
-0001820716 00000 n
-0001820836 00000 n
-0001820961 00000 n
-0001821087 00000 n
-0001821229 00000 n
-0001821372 00000 n
-0001821523 00000 n
-0001821676 00000 n
-0001821846 00000 n
-0001822007 00000 n
-0001822164 00000 n
-0001822312 00000 n
-0001822463 00000 n
-0001822625 00000 n
-0001822788 00000 n
-0001822961 00000 n
-0001823119 00000 n
-0001823288 00000 n
-0001823454 00000 n
-0001823630 00000 n
-0001823811 00000 n
-0001823992 00000 n
-0001824153 00000 n
-0001824325 00000 n
-0001824493 00000 n
-0001824671 00000 n
-0001824816 00000 n
-0001824973 00000 n
-0001825153 00000 n
-0001825333 00000 n
-0001825498 00000 n
-0001825668 00000 n
-0001825844 00000 n
-0001826021 00000 n
-0001826198 00000 n
-0001826368 00000 n
-0001826540 00000 n
-0001826714 00000 n
-0001826891 00000 n
-0001827041 00000 n
-0001827202 00000 n
-0001827370 00000 n
-0001827540 00000 n
-0001827705 00000 n
-0001827870 00000 n
-0001828028 00000 n
-0001828196 00000 n
-0001828390 00000 n
-0001828587 00000 n
-0001828780 00000 n
-0001828975 00000 n
-0001829143 00000 n
-0001829311 00000 n
-0001829506 00000 n
-0001829701 00000 n
-0001829881 00000 n
-0001830071 00000 n
-0001830265 00000 n
-0001830459 00000 n
-0001830632 00000 n
-0001830816 00000 n
-0001830990 00000 n
-0001831174 00000 n
-0001831373 00000 n
-0001831583 00000 n
-0001831752 00000 n
-0001831921 00000 n
-0001832098 00000 n
-0001832286 00000 n
-0001832457 00000 n
-0001832639 00000 n
-0001832831 00000 n
-0001833025 00000 n
-0001833185 00000 n
-0001833347 00000 n
-0001833508 00000 n
-0001833672 00000 n
-0001833846 00000 n
-0001834017 00000 n
-0001834175 00000 n
-0001834333 00000 n
-0001834509 00000 n
-0001834687 00000 n
-0001834842 00000 n
-0001834997 00000 n
-0001835165 00000 n
-0001835333 00000 n
-0001835495 00000 n
-0001835667 00000 n
-0001835814 00000 n
-0001835973 00000 n
-0001836132 00000 n
-0001836306 00000 n
-0001836491 00000 n
-0001836649 00000 n
-0001836817 00000 n
-0001836973 00000 n
-0001837140 00000 n
-0001837316 00000 n
-0001837494 00000 n
-0001837781 00000 n
-0001837859 00000 n
-0001838036 00000 n
-0001838228 00000 n
-0001838493 00000 n
-0001838668 00000 n
-0001838909 00000 n
-0001839086 00000 n
-0001839310 00000 n
-0001839527 00000 n
-0001839765 00000 n
-0001839971 00000 n
-0001840152 00000 n
-0001840361 00000 n
-0001840590 00000 n
-0001840771 00000 n
-0001840973 00000 n
-0001841187 00000 n
-0001841410 00000 n
-0001841638 00000 n
-0001841871 00000 n
-0001842080 00000 n
-0001842312 00000 n
-0001842529 00000 n
-0001842738 00000 n
-0001842957 00000 n
-0001843215 00000 n
-0001843465 00000 n
-0001843700 00000 n
-0001843962 00000 n
-0001844208 00000 n
-0001844429 00000 n
-0001844666 00000 n
-0001844863 00000 n
-0001845079 00000 n
-0001845317 00000 n
-0001845619 00000 n
-0001845825 00000 n
-0001846010 00000 n
-0001846241 00000 n
-0001846479 00000 n
-0001846717 00000 n
-0001846950 00000 n
-0001847210 00000 n
-0001847486 00000 n
-0001847663 00000 n
-0001847830 00000 n
-0001848042 00000 n
-0001848284 00000 n
-0001848461 00000 n
-0001848645 00000 n
-0001848852 00000 n
-0001849535 00000 n
-0001859035 00000 n
-0001859251 00000 n
-0001860614 00000 n
-0001861662 00000 n
-0001869707 00000 n
-0001869928 00000 n
-0001871291 00000 n
-0001872365 00000 n
-0001876892 00000 n
-0001877118 00000 n
-0001878481 00000 n
-0001879581 00000 n
-0001885517 00000 n
-0001885731 00000 n
-0001887094 00000 n
-0001888143 00000 n
-0001889593 00000 n
-0001889804 00000 n
-0001890124 00000 n
-0001891040 00000 n
-0001892203 00000 n
-0001892419 00000 n
-0001892722 00000 n
-0001893859 00000 n
-0001898274 00000 n
-0001898485 00000 n
-0001899848 00000 n
-0001900927 00000 n
-0001903285 00000 n
-0001903499 00000 n
-0001903841 00000 n
-0001904979 00000 n
-0001906491 00000 n
-0001906709 00000 n
-0001908072 00000 n
+0000283905 00000 n
+0000284178 00000 n
+0000284387 00000 n
+0000308927 00000 n
+0000309242 00000 n
+0000309299 00000 n
+0000309501 00000 n
+0000309707 00000 n
+0000309940 00000 n
+0000332357 00000 n
+0000332624 00000 n
+0000332832 00000 n
+0000333040 00000 n
+0000356198 00000 n
+0000356439 00000 n
+0000379331 00000 n
+0000379572 00000 n
+0000401205 00000 n
+0000401498 00000 n
+0000401544 00000 n
+0000401735 00000 n
+0000401792 00000 n
+0000402001 00000 n
+0000431325 00000 n
+0000431623 00000 n
+0000431827 00000 n
+0000431873 00000 n
+0000453413 00000 n
+0000453725 00000 n
+0000453782 00000 n
+0000453958 00000 n
+0000454188 00000 n
+0000454246 00000 n
+0000488059 00000 n
+0000488353 00000 n
+0000488578 00000 n
+0000488635 00000 n
+0000488858 00000 n
+0000508834 00000 n
+0000509141 00000 n
+0000509362 00000 n
+0000509589 00000 n
+0000509646 00000 n
+0000510080 00000 n
+0000510763 00000 n
+0000534912 00000 n
+0000535214 00000 n
+0000535260 00000 n
+0000535522 00000 n
+0000535755 00000 n
+0000535813 00000 n
+0000536026 00000 n
+0000550353 00000 n
+0000550702 00000 n
+0000550867 00000 n
+0000550913 00000 n
+0000551135 00000 n
+0000551355 00000 n
+0000551584 00000 n
+0000551793 00000 n
+0000551851 00000 n
+0000552032 00000 n
+0000552263 00000 n
+0000552466 00000 n
+0000552524 00000 n
+0000552748 00000 n
+0000580974 00000 n
+0000581313 00000 n
+0000581359 00000 n
+0000581583 00000 n
+0000581805 00000 n
+0000582019 00000 n
+0000582225 00000 n
+0000582428 00000 n
+0000582485 00000 n
+0000582658 00000 n
+0000582715 00000 n
+0000606719 00000 n
+0000606973 00000 n
+0000607019 00000 n
+0000646371 00000 n
+0000646698 00000 n
+0000646902 00000 n
+0000647107 00000 n
+0000647312 00000 n
+0000647523 00000 n
+0000647735 00000 n
+0000647947 00000 n
+0000666791 00000 n
+0000667154 00000 n
+0000667200 00000 n
+0000667415 00000 n
+0000667642 00000 n
+0000667870 00000 n
+0000668089 00000 n
+0000668297 00000 n
+0000668505 00000 n
+0000668689 00000 n
+0000668735 00000 n
+0000669037 00000 n
+0000669279 00000 n
+0000697105 00000 n
+0000697421 00000 n
+0000697645 00000 n
+0000697833 00000 n
+0000698041 00000 n
+0000698098 00000 n
+0000717289 00000 n
+0000717564 00000 n
+0000717610 00000 n
+0000717819 00000 n
+0000718037 00000 n
+0000718095 00000 n
+0000718153 00000 n
+0000718385 00000 n
+0000755631 00000 n
+0000755904 00000 n
+0000756111 00000 n
+0000781582 00000 n
+0000781884 00000 n
+0000782110 00000 n
+0000782168 00000 n
+0000782392 00000 n
+0000782450 00000 n
+0000782646 00000 n
+0000807827 00000 n
+0000808095 00000 n
+0000808152 00000 n
+0000829431 00000 n
+0000829690 00000 n
+0000829747 00000 n
+0000830173 00000 n
+0000830389 00000 n
+0000864402 00000 n
+0000864643 00000 n
+0000890252 00000 n
+0000890480 00000 n
+0000908717 00000 n
+0000908984 00000 n
+0000909041 00000 n
+0000909254 00000 n
+0000909454 00000 n
+0000934745 00000 n
+0000935044 00000 n
+0000935273 00000 n
+0000935331 00000 n
+0000956543 00000 n
+0000956872 00000 n
+0000957085 00000 n
+0000957282 00000 n
+0000957502 00000 n
+0000957560 00000 n
+0000958133 00000 n
+0000958191 00000 n
+0000958237 00000 n
+0000975493 00000 n
+0000975765 00000 n
+0000975822 00000 n
+0000976025 00000 n
+0000976082 00000 n
+0000976140 00000 n
+0000976198 00000 n
+0000988451 00000 n
+0000988705 00000 n
+0000988751 00000 n
+0000988808 00000 n
+0001021153 00000 n
+0001021501 00000 n
+0001021547 00000 n
+0001021721 00000 n
+0001021907 00000 n
+0001022103 00000 n
+0001022324 00000 n
+0001022381 00000 n
+0001022647 00000 n
+0001022909 00000 n
+0001023170 00000 n
+0001040801 00000 n
+0001041138 00000 n
+0001041184 00000 n
+0001041368 00000 n
+0001041571 00000 n
+0001041772 00000 n
+0001041986 00000 n
+0001060275 00000 n
+0001064232 00000 n
+0001071188 00000 n
+0001071512 00000 n
+0001071569 00000 n
+0001071785 00000 n
+0001071998 00000 n
+0001072220 00000 n
+0001072443 00000 n
+0001072676 00000 n
+0001072889 00000 n
+0001100599 00000 n
+0001104168 00000 n
+0001105031 00000 n
+0001105284 00000 n
+0001127932 00000 n
+0001128233 00000 n
+0001128279 00000 n
+0001128336 00000 n
+0001128549 00000 n
+0001128772 00000 n
+0001129004 00000 n
+0001142596 00000 n
+0001142892 00000 n
+0001143054 00000 n
+0001143100 00000 n
+0001143310 00000 n
+0001143356 00000 n
+0001143580 00000 n
+0001143638 00000 n
+0001143695 00000 n
+0001143940 00000 n
+0001143998 00000 n
+0001144708 00000 n
+0001157024 00000 n
+0001157339 00000 n
+0001157567 00000 n
+0001157613 00000 n
+0001157836 00000 n
+0001157893 00000 n
+0001158122 00000 n
+0001180291 00000 n
+0001180532 00000 n
+0001210334 00000 n
+0001210638 00000 n
+0001210840 00000 n
+0001211029 00000 n
+0001211086 00000 n
+0001211254 00000 n
+0001211488 00000 n
+0001211713 00000 n
+0001243447 00000 n
+0001243702 00000 n
+0001245167 00000 n
+0001245409 00000 n
+0001263011 00000 n
+0001263326 00000 n
+0001263372 00000 n
+0001263429 00000 n
+0001263648 00000 n
+0001263815 00000 n
+0001263872 00000 n
+0001263930 00000 n
+0001264150 00000 n
+0001264208 00000 n
+0001291924 00000 n
+0001292192 00000 n
+0001292249 00000 n
+0001292307 00000 n
+0001308161 00000 n
+0001308518 00000 n
+0001308564 00000 n
+0001309311 00000 n
+0001309606 00000 n
+0001309919 00000 n
+0001310235 00000 n
+0001310544 00000 n
+0001310864 00000 n
+0001311179 00000 n
+0001311528 00000 n
+0001311892 00000 n
+0001312192 00000 n
+0001312250 00000 n
+0001312574 00000 n
+0001329510 00000 n
+0001329843 00000 n
+0001329889 00000 n
+0001330231 00000 n
+0001330547 00000 n
+0001330783 00000 n
+0001330965 00000 n
+0001331023 00000 n
+0001331356 00000 n
+0001331414 00000 n
+0001331617 00000 n
+0001331811 00000 n
+0001345531 00000 n
+0001345824 00000 n
+0001346043 00000 n
+0001346269 00000 n
+0001346326 00000 n
+0001346384 00000 n
+0001379810 00000 n
+0001380078 00000 n
+0001380135 00000 n
+0001403556 00000 n
+0001403836 00000 n
+0001403882 00000 n
+0001403939 00000 n
+0001404171 00000 n
+0001404403 00000 n
+0001426734 00000 n
+0001427048 00000 n
+0001427106 00000 n
+0001427163 00000 n
+0001427365 00000 n
+0001427422 00000 n
+0001427644 00000 n
+0001427856 00000 n
+0001445784 00000 n
+0001446096 00000 n
+0001446142 00000 n
+0001446360 00000 n
+0001446417 00000 n
+0001446641 00000 n
+0001446852 00000 n
+0001447064 00000 n
+0001447279 00000 n
+0001447489 00000 n
+0001447546 00000 n
+0001465789 00000 n
+0001466090 00000 n
+0001466356 00000 n
+0001466617 00000 n
+0001466662 00000 n
+0001466886 00000 n
+0001466944 00000 n
+0001478274 00000 n
+0001478567 00000 n
+0001478804 00000 n
+0001478850 00000 n
+0001479085 00000 n
+0001497823 00000 n
+0001498077 00000 n
+0001498135 00000 n
+0001515084 00000 n
+0001515372 00000 n
+0001515598 00000 n
+0001515656 00000 n
+0001515857 00000 n
+0001515914 00000 n
+0001516619 00000 n
+0001516845 00000 n
+0001516903 00000 n
+0001536772 00000 n
+0001537081 00000 n
+0001537138 00000 n
+0001537416 00000 n
+0001537474 00000 n
+0001537720 00000 n
+0001537954 00000 n
+0001538181 00000 n
+0001554223 00000 n
+0001554538 00000 n
+0001554759 00000 n
+0001554816 00000 n
+0001554873 00000 n
+0001555100 00000 n
+0001555157 00000 n
+0001555399 00000 n
+0001566994 00000 n
+0001567303 00000 n
+0001567349 00000 n
+0001567613 00000 n
+0001567878 00000 n
+0001567935 00000 n
+0001568131 00000 n
+0001568318 00000 n
+0001575961 00000 n
+0001576276 00000 n
+0001576322 00000 n
+0001576502 00000 n
+0001576687 00000 n
+0001576900 00000 n
+0001579368 00000 n
+0001580189 00000 n
+0001580394 00000 n
+0001614360 00000 n
+0001616725 00000 n
+0001616941 00000 n
+0001624540 00000 n
+0001624798 00000 n
+0001639330 00000 n
+0001640151 00000 n
+0001640353 00000 n
+0001655705 00000 n
+0001656526 00000 n
+0001664342 00000 n
+0001664639 00000 n
+0001664826 00000 n
+0001664883 00000 n
+0001664941 00000 n
+0001665861 00000 n
+0001665919 00000 n
+0001682772 00000 n
+0001683040 00000 n
+0001683098 00000 n
+0001697146 00000 n
+0001697400 00000 n
+0001697446 00000 n
+0001697492 00000 n
+0001697549 00000 n
+0001716757 00000 n
+0001717011 00000 n
+0001717068 00000 n
+0001717126 00000 n
+0001732074 00000 n
+0001732328 00000 n
+0001732385 00000 n
+0001732443 00000 n
+0001737856 00000 n
+0001738111 00000 n
+0001755075 00000 n
+0001755329 00000 n
+0001755386 00000 n
+0001755792 00000 n
+0001769120 00000 n
+0001769406 00000 n
+0001769617 00000 n
+0001769675 00000 n
+0001789056 00000 n
+0001789311 00000 n
+0001809449 00000 n
+0001809721 00000 n
+0001809779 00000 n
+0001809977 00000 n
+0001820281 00000 n
+0001820535 00000 n
+0001820581 00000 n
+0001820710 00000 n
+0001820830 00000 n
+0001820955 00000 n
+0001821081 00000 n
+0001821223 00000 n
+0001821366 00000 n
+0001821517 00000 n
+0001821670 00000 n
+0001821840 00000 n
+0001822001 00000 n
+0001822158 00000 n
+0001822306 00000 n
+0001822457 00000 n
+0001822619 00000 n
+0001822782 00000 n
+0001822955 00000 n
+0001823113 00000 n
+0001823282 00000 n
+0001823448 00000 n
+0001823624 00000 n
+0001823805 00000 n
+0001823986 00000 n
+0001824147 00000 n
+0001824319 00000 n
+0001824487 00000 n
+0001824665 00000 n
+0001824810 00000 n
+0001824967 00000 n
+0001825147 00000 n
+0001825327 00000 n
+0001825492 00000 n
+0001825662 00000 n
+0001825838 00000 n
+0001826015 00000 n
+0001826192 00000 n
+0001826362 00000 n
+0001826534 00000 n
+0001826708 00000 n
+0001826885 00000 n
+0001827035 00000 n
+0001827196 00000 n
+0001827364 00000 n
+0001827534 00000 n
+0001827699 00000 n
+0001827864 00000 n
+0001828022 00000 n
+0001828190 00000 n
+0001828384 00000 n
+0001828581 00000 n
+0001828774 00000 n
+0001828969 00000 n
+0001829137 00000 n
+0001829305 00000 n
+0001829500 00000 n
+0001829695 00000 n
+0001829875 00000 n
+0001830065 00000 n
+0001830259 00000 n
+0001830453 00000 n
+0001830626 00000 n
+0001830810 00000 n
+0001830984 00000 n
+0001831168 00000 n
+0001831367 00000 n
+0001831577 00000 n
+0001831746 00000 n
+0001831915 00000 n
+0001832092 00000 n
+0001832280 00000 n
+0001832451 00000 n
+0001832633 00000 n
+0001832825 00000 n
+0001833019 00000 n
+0001833179 00000 n
+0001833341 00000 n
+0001833502 00000 n
+0001833666 00000 n
+0001833840 00000 n
+0001834011 00000 n
+0001834169 00000 n
+0001834327 00000 n
+0001834503 00000 n
+0001834681 00000 n
+0001834836 00000 n
+0001834991 00000 n
+0001835159 00000 n
+0001835327 00000 n
+0001835489 00000 n
+0001835661 00000 n
+0001835808 00000 n
+0001835967 00000 n
+0001836126 00000 n
+0001836300 00000 n
+0001836485 00000 n
+0001836643 00000 n
+0001836811 00000 n
+0001836967 00000 n
+0001837134 00000 n
+0001837310 00000 n
+0001837488 00000 n
+0001837775 00000 n
+0001837853 00000 n
+0001838030 00000 n
+0001838222 00000 n
+0001838487 00000 n
+0001838662 00000 n
+0001838903 00000 n
+0001839080 00000 n
+0001839304 00000 n
+0001839521 00000 n
+0001839759 00000 n
+0001839965 00000 n
+0001840146 00000 n
+0001840355 00000 n
+0001840584 00000 n
+0001840765 00000 n
+0001840967 00000 n
+0001841181 00000 n
+0001841404 00000 n
+0001841632 00000 n
+0001841865 00000 n
+0001842074 00000 n
+0001842306 00000 n
+0001842523 00000 n
+0001842732 00000 n
+0001842951 00000 n
+0001843209 00000 n
+0001843459 00000 n
+0001843694 00000 n
+0001843956 00000 n
+0001844202 00000 n
+0001844423 00000 n
+0001844660 00000 n
+0001844857 00000 n
+0001845073 00000 n
+0001845311 00000 n
+0001845613 00000 n
+0001845819 00000 n
+0001846004 00000 n
+0001846235 00000 n
+0001846473 00000 n
+0001846711 00000 n
+0001846944 00000 n
+0001847204 00000 n
+0001847480 00000 n
+0001847657 00000 n
+0001847824 00000 n
+0001848036 00000 n
+0001848278 00000 n
+0001848455 00000 n
+0001848639 00000 n
+0001848846 00000 n
+0001849529 00000 n
+0001859029 00000 n
+0001859245 00000 n
+0001860608 00000 n
+0001861656 00000 n
+0001869701 00000 n
+0001869922 00000 n
+0001871285 00000 n
+0001872359 00000 n
+0001876886 00000 n
+0001877112 00000 n
+0001878475 00000 n
+0001879575 00000 n
+0001885511 00000 n
+0001885725 00000 n
+0001887088 00000 n
+0001888137 00000 n
+0001889587 00000 n
+0001889798 00000 n
+0001890118 00000 n
+0001891034 00000 n
+0001892197 00000 n
+0001892413 00000 n
+0001892716 00000 n
+0001893853 00000 n
+0001898268 00000 n
+0001898479 00000 n
+0001899842 00000 n
+0001900921 00000 n
+0001903279 00000 n
+0001903493 00000 n
+0001903835 00000 n
+0001904973 00000 n
+0001906485 00000 n
+0001906703 00000 n
+0001908066 00000 n
trailer
<< /Size 733
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1909210
+1909204
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 28229a2..fc49b00 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -5199,10 +5199,10 @@ TODO - easiest to simply store using DataNucleus' support for collections, mark
<div class="sect3">
<h4 id="__code_memberorder_code">5.1.1. <code>@MemberOrder</code></h4>
<div class="paragraph">
-<p>The <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation is used to specify the relative order of domain class properties, collections and actions.</p>
+<p>The <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation is used to specify the relative order of domain class properties, collections and actions.</p>
</div>
<div class="paragraph">
-<p>The annotation defines two attributes, <a href="rgant.html#_rgant_MemberOrder_name"><code>name()</code></a> and <a href="rgant.html#_rgant_MemberOrder_sequence"><code>sequence()</code></a>. Their usage depends on the member type:</p>
+<p>The annotation defines two attributes, <a href="rgant.html#_rgant-MemberOrder_name"><code>name()</code></a> and <a href="rgant.html#_rgant-MemberOrder_sequence"><code>sequence()</code></a>. Their usage depends on the member type:</p>
</div>
<div class="ulist">
<ul>
@@ -5266,7 +5266,7 @@ property is placed in a fallback "General" group, called "General".<br></p>
<p>This defines three property (or member) groups, "General", "Detail" and "Misc"; "General" is the default if no <code>name</code> attribute is specified. Properties in the same member group are rendered together, as a fieldset.</p>
</div>
<div class="paragraph">
-<p>In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the <code>@MemberOrder</code>'s <a href="rgant.html#_rgant_MemberOrder_name"><code>name()</code></a> attribute, holding the value of the property or collection.</p>
+<p>In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the <code>@MemberOrder</code>'s <a href="rgant.html#_rgant-MemberOrder_name"><code>name()</code></a> attribute, holding the value of the property or collection.</p>
</div>
<div class="paragraph">
<p>For example:</p>
@@ -5295,7 +5295,7 @@ property is placed in a fallback "General" group, called "General".<br></p>
<p>will associate the <code>completed()</code> and <code>notYetCompleted()</code> actions with the <code>complete</code> property, and will associate the <code>add()</code> and <code>remove()</code> actions with the <code>dependencies</code> collection.</p>
</div>
<div class="paragraph">
-<p>The value of <a href="rgant.html#_rgant_MemberOrder_sequence"><code>sequence()</code></a> is a string. The simplest convention (as shown in the example above) is to use numbers — 1, 2, 3 — though it is a better idea to leave gaps in the numbers — 10, 20, 30 perhaps — such that a new member may be added without having to edit existing numbers.</p>
+<p>The value of <a href="rgant.html#_rgant-MemberOrder_sequence"><code>sequence()</code></a> is a string. The simplest convention (as shown in the example above) is to use numbers — 1, 2, 3 — though it is a better idea to leave gaps in the numbers — 10, 20, 30 perhaps — such that a new member may be added without having to edit existing numbers.</p>
</div>
<div class="paragraph">
<p>Even better is to adopt the 'dewey-decimal' notation — 1, 1.1, 1.2, 2, 3, 5.1.1, 5.2.2, 5.2, 5.3 — which allows for an indefinite amount of future insertion. It also allows subclasses to insert their class members as required.</p>
@@ -5304,7 +5304,7 @@ property is placed in a fallback "General" group, called "General".<br></p>
<div class="sect3">
<h4 id="__code_membergrouplayout_code">5.1.2. <code>@MemberGroupLayout</code></h4>
<div class="paragraph">
-<p>The <a href="rgant.html#_rgant_MemberGroupLayout"><code>@MemberGroupLayout</code></a> annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.</p>
+<p>The <a href="rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a> annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.</p>
</div>
<div class="paragraph">
<p>The property groups/fieldsets in this case are those that are inferred from the <code>@MemberOrder#name()</code> attribute.</p>
@@ -5320,7 +5320,7 @@ property is placed in a fallback "General" group, called "General".<br></p>
<p>It is also possible to combine <code>@MemberOrder</code> with dynamic layouts, either using <a href="#_ugfun_object-layout_xml">XML</a> or <a href="#_ugfun_object-layout_dynamic">JSON</a>. The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does <em>not</em> specify the properties/collections/actions within those grid regions. The <code>@MemberOrder</code> annotation in effect "binds" the properties or collections to those regions of the grid.</p>
</div>
<div class="paragraph">
-<p>When dynamic layouts are used this way, the <a href="rgant.html#_rgant_MemberGroupLayout"><code>@MemberGroupLayout</code></a> annotation is essentially ignored, but the metadata from the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation (and the other layout annotations, <a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>) are all still honoured.</p>
+<p>When dynamic layouts are used this way, the <a href="rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a> annotation is essentially ignored, but the metadata from the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation (and the other layout annotations, <a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>) are all still honoured.</p>
</div>
</td>
</tr>
@@ -5886,9 +5886,9 @@ below summarises the choices:</p>
<thead>
<tr>
<th class="tableblock halign-left valign-bottom">Style</th>
-<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant_MemberGroupLayout"><code>@MemberGroupLayout</code></a></th>
-<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a></th>
-<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a></th>
+<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a></th>
+<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a></th>
+<th class="tableblock halign-center valign-bottom"><a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a></th>
</tr>
</thead>
<tbody>
@@ -6753,7 +6753,7 @@ null response or invoking a void action. But how to implement this?</em></p>
</div>
<div class="paragraph">
<p>One way to implement this idea is to provide a custom implementation of the <a href="rgsvc.html#_rgsvc_spi_RoutingService"><code>RoutingService</code></a> SPI domain service. The default implementation will either return
-the current object (if not null), else the home page (as defined by <a href="rgant.html#_rgant_HomePage"><code>@HomePage</code></a>) if
+the current object (if not null), else the home page (as defined by <a href="rgant.html#_rgant-HomePage"><code>@HomePage</code></a>) if
one exists.</p>
</div>
<div class="paragraph">
@@ -6867,12 +6867,12 @@ a domain object, for instance to check English syntax?</em></p>
<p>Set up a <a href="rgcsm.html#_rgcsm_classes_domainevent">domain event</a> <a href="rgcsm.html#_rgcsm_classes_super_AbstractSubscriber">subscriber</a> that can veto the changes.</p>
</li>
<li>
-<p>if the change is made through an action, you can use <a href="rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a>.</p>
+<p>if the change is made through an action, you can use <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a>.</p>
</li>
</ul>
</div>
<div class="paragraph">
-<p>if if the change is made through an edit, you can use <a href="rgant.html#_rgant_Property_domainEvent"><code>@Property#domainEvent()</code></a>.</p>
+<p>if if the change is made through an edit, you can use <a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>.</p>
</div>
<div class="paragraph">
<p>You’ll need some way to know which fields should be spell checked. Two ways spring to mind:</p>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.pdf b/content/guides/ugfun.pdf
index 535087c..ba9427f 100644
--- a/content/guides/ugfun.pdf
+++ b/content/guides/ugfun.pdf
@@ -4,8 +4,8 @@
<< /Title (Fundamentals)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160429112917+01'00')
-/ModDate (D:20160429112917+01'00')
+/CreationDate (D:20160513191557+01'00')
+/ModDate (D:20160513191557+01'00')
>>
endobj
2 0 obj
@@ -87904,7 +87904,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder)
+/URI (rgant.pdf#_rgant-MemberOrder)
>>
/Subtype /Link
/Rect [72.41757142857143 452.57600000000025 135.41757142857145 463.07600000000025]
@@ -87915,7 +87915,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder_name)
+/URI (rgant.pdf#_rgant-MemberOrder_name)
>>
/Subtype /Link
/Rect [244.18035714285713 409.01600000000025 275.68035714285713 419.51600000000025]
@@ -87926,7 +87926,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder_sequence)
+/URI (rgant.pdf#_rgant-MemberOrder_sequence)
>>
/Subtype /Link
/Rect [301.07349999999997 409.01600000000025 353.57349999999997 419.51600000000025]
@@ -91912,7 +91912,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder_name)
+/URI (rgant.pdf#_rgant-MemberOrder_name)
>>
/Subtype /Link
/Rect [281.95962395833334 405.7259999999999 313.45962395833334 416.2259999999999]
@@ -93367,7 +93367,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder_sequence)
+/URI (rgant.pdf#_rgant-MemberOrder_sequence)
>>
/Subtype /Link
/Rect [114.31958333333333 765.4259999999999 166.81958333333333 775.9259999999999]
@@ -93381,7 +93381,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberGroupLayout)
+/URI (rgant.pdf#_rgant-MemberGroupLayout)
>>
/Subtype /Link
/Rect [70.3034 613.466 164.8034 623.966]
@@ -93408,7 +93408,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberGroupLayout)
+/URI (rgant.pdf#_rgant-MemberGroupLayout)
>>
/Subtype /Link
/Rect [368.3745794270833 415.6660000000001 462.8745794270833 426.1660000000001]
@@ -93419,7 +93419,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder)
+/URI (rgant.pdf#_rgant-MemberOrder)
>>
/Subtype /Link
/Rect [367.05384999999995 399.8860000000001 430.05384999999995 410.3860000000001]
@@ -93430,7 +93430,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ActionLayout)
+/URI (rgant.pdf#_rgant-ActionLayout)
>>
/Subtype /Link
/Rect [259.9104807942708 384.1060000000001 328.1604807942708 394.6060000000001]
@@ -93441,7 +93441,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_PropertyLayout)
+/URI (rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
/Rect [335.2893205295139 384.1060000000001 414.0393205295139 394.6060000000001]
@@ -93452,7 +93452,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_CollectionLayout)
+/URI (rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
/Rect [442.157 384.1060000000001 531.4069999999999 394.6060000000001]
@@ -106552,7 +106552,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberGroupLayout)
+/URI (rgant.pdf#_rgant-MemberGroupLayout)
>>
/Subtype /Link
/Rect [188.54 488.0830000000001 283.03999999999996 498.5830000000001]
@@ -106563,7 +106563,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_MemberOrder)
+/URI (rgant.pdf#_rgant-MemberOrder)
>>
/Subtype /Link
/Rect [328.98999999999995 488.0830000000001 391.99 498.5830000000001]
@@ -106574,7 +106574,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_ActionLayout)
+/URI (rgant.pdf#_rgant-ActionLayout)
>>
/Subtype /Link
/Rect [449.52675 513.8080000000001 517.77675 524.3080000000001]
@@ -106585,7 +106585,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_PropertyLayout)
+/URI (rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
/Rect [444.27675 499.5280000000001 523.02675 510.0280000000001]
@@ -106596,7 +106596,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_CollectionLayout)
+/URI (rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
/Rect [440.56499999999994 488.0830000000001 529.8149999999999 498.5830000000001]
@@ -128931,7 +128931,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_HomePage)
+/URI (rgant.pdf#_rgant-HomePage)
>>
/Subtype /Link
/Rect [196.898794921875 547.596 244.148794921875 558.096]
@@ -133140,7 +133140,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_Action_domainEvent)
+/URI (rgant.pdf#_rgant-Action_domainEvent)
>>
/Subtype /Link
/Rect [331.113 539.1060000000002 441.363 549.6060000000002]
@@ -133151,7 +133151,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_Property_domainEvent)
+/URI (rgant.pdf#_rgant-Property_domainEvent)
>>
/Subtype /Link
/Rect [311.21250000000003 511.3260000000003 431.96250000000003 521.8260000000002]
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/migration-notes.html b/content/migration-notes.html
index afcf54b..f6edeaa 100644
--- a/content/migration-notes.html
+++ b/content/migration-notes.html
@@ -518,10 +518,10 @@ much enhanced support for custom layouts.</p>
</div>
<div class="paragraph">
<p>The new <code>Xxx.layout.xml</code> file is optional; without it domain objects will
-continue to be rendered as before, using metadata from annotations (<a href="rgant.html#_rgant_DomainObjectLayout"><code>@DomainObjectLayout</code></a>,
-<a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>,
-<a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> and
-<a href="rgant.html#_rgant_MemberGroupLayout"><code>@MemberGroupLayout</code></a>), and also from any <a href="ugfun.html#_ugfun_object-layout_dynamic"><code>Xxx.layout.json</code></a>
+continue to be rendered as before, using metadata from annotations (<a href="rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>,
+<a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>,
+<a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> and
+<a href="rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a>), and also from any <a href="ugfun.html#_ugfun_object-layout_dynamic"><code>Xxx.layout.json</code></a>
file that might already exist. There is therefore no requirement to move to the new more flexible XML-based layout.</p>
</div>
<div class="paragraph">
@@ -574,8 +574,8 @@ of these members by subscribing to their respective domain events.</p>
<div class="sect2">
<h3 id="_jaxb_view_models_are_editable">JAXB view models are editable</h3>
<div class="paragraph">
-<p>All <a href="rgant.html#_rgant_XmlRootElement"><code>@XmlRootElement</code></a> view models are now implicitly editable. Therefore any
-view models that should be read-only should have editing attribute disabled using <a href="rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a> (or use a <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto editability).</p>
+<p>All <a href="rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models are now implicitly editable. Therefore any
+view models that should be read-only should have editing attribute disabled using <a href="rgant.html#_rgant-DomainObject_editing"><code>@DomainObject#editing()</code></a> (or use a <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto editability).</p>
</div>
</div>
<div class="sect2">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/release-notes.html
----------------------------------------------------------------------
diff --git a/content/release-notes.html b/content/release-notes.html
index 48324e6..e980f11 100644
--- a/content/release-notes.html
+++ b/content/release-notes.html
@@ -1095,7 +1095,7 @@ corresponding domain event.</p>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="rgfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
</li>
<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
+<p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
</li>
<li>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p>
@@ -1113,7 +1113,7 @@ corresponding domain event.</p>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p>
</li>
<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="rgant.html#_rgant_ViewModel"><code>@ViewModel</code></a> and <a href="rgant.html#_rgant_XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p>
+<p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p>
</li>
<li>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p>
@@ -1128,7 +1128,7 @@ corresponding domain event.</p>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="rgfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
</li>
<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="rgant.html#_rgant_DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p>
+<p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p>
</li>
<li>
<p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/aim/aim-1.0.xsd
----------------------------------------------------------------------
diff --git a/content/schema/aim/aim-1.0.xsd b/content/schema/aim/aim-1.0.xsd
deleted file mode 100644
index 749fcd0..0000000
--- a/content/schema/aim/aim-1.0.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-\ufeff<?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/aim"
- elementFormDefault="qualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://isis.apache.org/schema/aim"
- xmlns:common="http://isis.apache.org/schema/common">
-
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="http://isis.apache.org/schema/common/common-1.0.xsd"/>
-
- <xs:element name="actionInvocationMementoDto">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="metadata">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="transactionId" type="xs:string"/>
- <xs:element name="sequence" type="xs:int"/>
- <xs:element name="timestamp" type="xs:dateTime"/>
- <xs:element name="target" type="common:oidDto"/>
- <xs:element name="targetClass" type="xs:string"/>
- <xs:element name="targetAction" type="xs:string"/>
- <xs:element name="actionIdentifier" type="xs:string"/>
- <xs:element name="user" type="xs:string"/>
- <xs:element name="title" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="payload">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="parameters">
- <xs:complexType>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="param" type="paramDto"/>
- </xs:sequence>
- <xs:attribute name="num" use="required" type="xs:int"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="return" type="common:valueDto" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="paramDto">
- <xs:sequence>
- <xs:element name="value" type="common:valueDto"/>
- </xs:sequence>
- <xs:attribute name="parameterName" use="required" type="xs:string"/>
- <xs:attribute name="parameterType" use="required" type="common:valueType"/>
- <xs:attribute name="null" use="optional" type="xs:boolean"/>
- </xs:complexType>
-
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/aim/aim.xsd
----------------------------------------------------------------------
diff --git a/content/schema/aim/aim.xsd b/content/schema/aim/aim.xsd
deleted file mode 100644
index 749fcd0..0000000
--- a/content/schema/aim/aim.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-\ufeff<?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/aim"
- elementFormDefault="qualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://isis.apache.org/schema/aim"
- xmlns:common="http://isis.apache.org/schema/common">
-
- <xs:import namespace="http://isis.apache.org/schema/common" schemaLocation="http://isis.apache.org/schema/common/common-1.0.xsd"/>
-
- <xs:element name="actionInvocationMementoDto">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="metadata">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="transactionId" type="xs:string"/>
- <xs:element name="sequence" type="xs:int"/>
- <xs:element name="timestamp" type="xs:dateTime"/>
- <xs:element name="target" type="common:oidDto"/>
- <xs:element name="targetClass" type="xs:string"/>
- <xs:element name="targetAction" type="xs:string"/>
- <xs:element name="actionIdentifier" type="xs:string"/>
- <xs:element name="user" type="xs:string"/>
- <xs:element name="title" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="payload">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="parameters">
- <xs:complexType>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="param" type="paramDto"/>
- </xs:sequence>
- <xs:attribute name="num" use="required" type="xs:int"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="return" type="common:valueDto" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="paramDto">
- <xs:sequence>
- <xs:element name="value" type="common:valueDto"/>
- </xs:sequence>
- <xs:attribute name="parameterName" use="required" type="xs:string"/>
- <xs:attribute name="parameterType" use="required" type="common:valueType"/>
- <xs:attribute name="null" use="optional" type="xs:boolean"/>
- </xs:complexType>
-
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/chg/chg-1.0.xsd
----------------------------------------------------------------------
diff --git a/content/schema/chg/chg-1.0.xsd b/content/schema/chg/chg-1.0.xsd
new file mode 100644
index 0000000..078da44
--- /dev/null
+++ b/content/schema/chg/chg-1.0.xsd
@@ -0,0 +1,109 @@
+\ufeff<?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.0.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>
+ </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="0">
+ <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 within which this change occurred.
+ </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/3eb5a1da/content/schema/chg/chg.xsd
----------------------------------------------------------------------
diff --git a/content/schema/chg/chg.xsd b/content/schema/chg/chg.xsd
new file mode 100644
index 0000000..078da44
--- /dev/null
+++ b/content/schema/chg/chg.xsd
@@ -0,0 +1,109 @@
+\ufeff<?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.0.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>
+ </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="0">
+ <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 within which this change occurred.
+ </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/3eb5a1da/content/schema/cmd/cmd-1.0.xsd
----------------------------------------------------------------------
diff --git a/content/schema/cmd/cmd-1.0.xsd b/content/schema/cmd/cmd-1.0.xsd
new file mode 100644
index 0000000..8f34661
--- /dev/null
+++ b/content/schema/cmd/cmd-1.0.xsd
@@ -0,0 +1,151 @@
+\ufeff<?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.0.xsd"/>
+
+ <xs:element name="commandDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.0 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="1">
+ <xs:annotation>
+ <xs:documentation>Introduced in v1.1. 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="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="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: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>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/schema/cmd/cmd.xsd
----------------------------------------------------------------------
diff --git a/content/schema/cmd/cmd.xsd b/content/schema/cmd/cmd.xsd
new file mode 100644
index 0000000..8f34661
--- /dev/null
+++ b/content/schema/cmd/cmd.xsd
@@ -0,0 +1,151 @@
+\ufeff<?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.0.xsd"/>
+
+ <xs:element name="commandDto">
+ <xs:annotation>
+ <xs:documentation>Represents v1.0 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="1">
+ <xs:annotation>
+ <xs:documentation>Introduced in v1.1. 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="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="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: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>
[7/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
ISIS-1291: commands, publishing and interaction context
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/3eb5a1da
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/3eb5a1da
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/3eb5a1da
Branch: refs/heads/asf-site
Commit: 3eb5a1daf718125cba9ab792158e6bf77c765681
Parents: 4d591ce
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 13 19:16:43 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 14 11:45:47 2016 +0100
----------------------------------------------------------------------
.../layout/grid/bootstrap3/bootstrap3.xsd | 12 +-
content/css/slick/1.5.0/config.rb | 18 +-
content/css/slick/1.5.0/fonts/slick.svg | 28 +-
content/css/slick/1.5.0/slick-theme.css | 402 +-
content/css/slick/1.5.0/slick-theme.scss | 372 +-
content/css/slick/1.5.0/slick.css | 230 +-
content/css/slick/1.5.0/slick.scss | 190 +-
content/guides/dg.html | 4 +-
content/guides/dg.pdf | 953 +-
.../reference-services/commands-and-events.png | Bin 0 -> 83946 bytes
.../reference-services/commands-and-events.pptx | Bin 0 -> 43674 bytes
content/guides/rgant.html | 4 +-
content/guides/rgant.pdf | 10 +-
content/guides/rgcms.html | 331 +-
content/guides/rgcms.pdf | 10498 +-
content/guides/rgsvc.html | 1936 +-
content/guides/rgsvc.pdf | 244745 +++++++++-------
content/guides/ugbtb.html | 10 +-
content/guides/ugbtb.pdf | 1242 +-
content/guides/ugfun.html | 24 +-
content/guides/ugfun.pdf | 42 +-
content/migration-notes.html | 12 +-
content/release-notes.html | 6 +-
content/schema/aim/aim-1.0.xsd | 74 -
content/schema/aim/aim.xsd | 74 -
content/schema/chg/chg-1.0.xsd | 109 +
content/schema/chg/chg.xsd | 109 +
content/schema/cmd/cmd-1.0.xsd | 151 +
content/schema/cmd/cmd.xsd | 151 +
content/schema/common/common-1.0.xsd | 120 +-
content/schema/common/common.xsd | 120 +-
content/schema/ixn/ixn-1.0.xsd | 227 +
content/schema/ixn/ixn.xsd | 227 +
content/screencasts.html | 26 +-
34 files changed, 141350 insertions(+), 121107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/applib/layout/grid/bootstrap3/bootstrap3.xsd
----------------------------------------------------------------------
diff --git a/content/applib/layout/grid/bootstrap3/bootstrap3.xsd b/content/applib/layout/grid/bootstrap3/bootstrap3.xsd
index 09087f6..f01916d 100644
--- a/content/applib/layout/grid/bootstrap3/bootstrap3.xsd
+++ b/content/applib/layout/grid/bootstrap3/bootstrap3.xsd
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://isis.apache.org/applib/layout/component" xmlns:tns="http://isis.apache.org/applib/layout/grid/bootstrap3" elementFormDefault="qualified" targetNamespace="http://isis.apache.org/applib/layout/grid/bootstrap3" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:tns="http://isis.apache.org/applib/layout/grid/bootstrap3" elementFormDefault="qualified" targetNamespace="http://isis.apache.org/applib/layout/grid/bootstrap3" version="1.0">
- <xs:import namespace="http://isis.apache.org/applib/layout/component" schemaLocation="../../component"/>
+ <xs:import namespace="http://isis.apache.org/applib/layout/component" schemaLocation="../../component/component.xsd"/>
<xs:element name="clearFixHidden" type="tns:clearFixHidden"/>
@@ -44,12 +44,12 @@
<xs:extension base="tns:bs3RowContent">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="sizeSpan" type="tns:sizeSpan"/>
- <xs:element minOccurs="0" ref="ns1:domainObject"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" ref="ns1:action"/>
+ <xs:element minOccurs="0" ref="cpt:domainObject"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="cpt:action"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="row" type="tns:row"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="tabGroup" type="tns:tabGroup"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" ref="ns1:fieldSet"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" ref="ns1:collection"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="cpt:fieldSet"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="cpt:collection"/>
<xs:element minOccurs="0" name="metadataError" type="xs:string"/>
</xs:sequence>
<xs:attribute name="id" type="xs:string"/>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/config.rb
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/config.rb b/content/css/slick/1.5.0/config.rb
index 81f5ae3..d9504b1 100644
--- a/content/css/slick/1.5.0/config.rb
+++ b/content/css/slick/1.5.0/config.rb
@@ -1,10 +1,10 @@
-css_dir = "."
-sass_dir = "."
-images_dir = "."
-fonts_dir = "fonts"
-relative_assets = true
-
-output_style = :compact
-line_comments = false
-
+css_dir = "."
+sass_dir = "."
+images_dir = "."
+fonts_dir = "fonts"
+relative_assets = true
+
+output_style = :compact
+line_comments = false
+
preferred_syntax = :scss
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/fonts/slick.svg
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/fonts/slick.svg b/content/css/slick/1.5.0/fonts/slick.svg
index b36a66a..60fbaf1 100644
--- a/content/css/slick/1.5.0/fonts/slick.svg
+++ b/content/css/slick/1.5.0/fonts/slick.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by Fontastic.me</metadata>
-<defs>
-<font id="slick" horiz-adv-x="512">
-<font-face font-family="slick" units-per-em="512" ascent="480" descent="-32"/>
-<missing-glyph horiz-adv-x="512" />
-
-<glyph unicode="→" d="M241 113l130 130c4 4 6 8 6 13 0 5-2 9-6 13l-130 130c-3 3-7 5-12 5-5 0-10-2-13-5l-29-30c-4-3-6-7-6-12 0-5 2-10 6-13l87-88-87-88c-4-3-6-8-6-13 0-5 2-9 6-12l29-30c3-3 8-5 13-5 5 0 9 2 12 5z m234 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="←" d="M296 113l29 30c4 3 6 7 6 12 0 5-2 10-6 13l-87 88 87 88c4 3 6 8 6 13 0 5-2 9-6 12l-29 30c-3 3-8 5-13 5-5 0-9-2-12-5l-130-130c-4-4-6-8-6-13 0-5 2-9 6-13l130-130c3-3 7-5 12-5 5 0 10 2 13 5z m179 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="•" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="a" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
-</font></defs></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by Fontastic.me</metadata>
+<defs>
+<font id="slick" horiz-adv-x="512">
+<font-face font-family="slick" units-per-em="512" ascent="480" descent="-32"/>
+<missing-glyph horiz-adv-x="512" />
+
+<glyph unicode="→" d="M241 113l130 130c4 4 6 8 6 13 0 5-2 9-6 13l-130 130c-3 3-7 5-12 5-5 0-10-2-13-5l-29-30c-4-3-6-7-6-12 0-5 2-10 6-13l87-88-87-88c-4-3-6-8-6-13 0-5 2-9 6-12l29-30c3-3 8-5 13-5 5 0 9 2 12 5z m234 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="←" d="M296 113l29 30c4 3 6 7 6 12 0 5-2 10-6 13l-87 88 87 88c4 3 6 8 6 13 0 5-2 9-6 12l-29 30c-3 3-8 5-13 5-5 0-9-2-12-5l-130-130c-4-4-6-8-6-13 0-5 2-9 6-13l130-130c3-3 7-5 12-5 5 0 10 2 13 5z m179 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="•" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="a" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
+</font></defs></svg>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/slick-theme.css
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick-theme.css b/content/css/slick/1.5.0/slick-theme.css
index a53cd69..22e3498 100644
--- a/content/css/slick/1.5.0/slick-theme.css
+++ b/content/css/slick/1.5.0/slick-theme.css
@@ -1,201 +1,201 @@
-@charset 'UTF-8';
-/* Slider */
-.slick-loading .slick-list
-{
- background: #fff url('./ajax-loader.gif') center center no-repeat;
-}
-
-/* Icons */
-@font-face
-{
- font-family: 'slick';
- font-weight: normal;
- font-style: normal;
-
- src: url('./fonts/slick.eot');
- src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg');
-}
-/* Arrows */
-.slick-prev,
-.slick-next
-{
- font-size: 0;
- line-height: 0;
-
- position: absolute;
- top: 50%;
-
- display: block;
-
- width: 20px;
- height: 20px;
- margin-top: -10px;
- padding: 0;
-
- cursor: pointer;
-
- color: transparent;
- border: none;
- outline: none;
- background: transparent;
-}
-.slick-prev:hover,
-.slick-prev:focus,
-.slick-next:hover,
-.slick-next:focus
-{
- color: transparent;
- outline: none;
- background: transparent;
-}
-.slick-prev:hover:before,
-.slick-prev:focus:before,
-.slick-next:hover:before,
-.slick-next:focus:before
-{
- opacity: 1;
-}
-.slick-prev.slick-disabled:before,
-.slick-next.slick-disabled:before
-{
- opacity: .25;
-}
-
-.slick-prev:before,
-.slick-next:before
-{
- font-family: 'slick';
- font-size: 20px;
- line-height: 1;
-
- opacity: .75;
- color: white;
-
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.slick-prev
-{
- left: -25px;
-}
-[dir='rtl'] .slick-prev
-{
- right: -25px;
- left: auto;
-}
-.slick-prev:before
-{
- content: '\u2190';
-}
-[dir='rtl'] .slick-prev:before
-{
- content: '\u2192';
-}
-
-.slick-next
-{
- right: -25px;
-}
-[dir='rtl'] .slick-next
-{
- right: auto;
- left: -25px;
-}
-.slick-next:before
-{
- content: '\u2192';
-}
-[dir='rtl'] .slick-next:before
-{
- content: '\u2190';
-}
-
-/* Dots */
-.slick-slider
-{
- margin-bottom: 30px;
-}
-
-.slick-dots
-{
- position: absolute;
- bottom: -45px;
-
- display: block;
-
- width: 100%;
- padding: 0;
-
- list-style: none;
-
- text-align: center;
-}
-.slick-dots li
-{
- position: relative;
-
- display: inline-block;
-
- width: 20px;
- height: 20px;
- margin: 0 5px;
- padding: 0;
-
- cursor: pointer;
-}
-.slick-dots li button
-{
- font-size: 0;
- line-height: 0;
-
- display: block;
-
- width: 20px;
- height: 20px;
- padding: 5px;
-
- cursor: pointer;
-
- color: transparent;
- border: 0;
- outline: none;
- background: transparent;
-}
-.slick-dots li button:hover,
-.slick-dots li button:focus
-{
- outline: none;
-}
-.slick-dots li button:hover:before,
-.slick-dots li button:focus:before
-{
- opacity: 1;
-}
-.slick-dots li button:before
-{
- font-family: 'slick';
- font-size: 6px;
- line-height: 20px;
-
- position: absolute;
- top: 0;
- left: 0;
-
- width: 20px;
- height: 20px;
-
- content: '\u2022';
- text-align: center;
-
- opacity: .25;
- color: black;
-
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-.slick-dots li.slick-active button:before
-{
- opacity: .75;
- color: black;
-}
+@charset 'UTF-8';
+/* Slider */
+.slick-loading .slick-list
+{
+ background: #fff url('./ajax-loader.gif') center center no-repeat;
+}
+
+/* Icons */
+@font-face
+{
+ font-family: 'slick';
+ font-weight: normal;
+ font-style: normal;
+
+ src: url('./fonts/slick.eot');
+ src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg');
+}
+/* Arrows */
+.slick-prev,
+.slick-next
+{
+ font-size: 0;
+ line-height: 0;
+
+ position: absolute;
+ top: 50%;
+
+ display: block;
+
+ width: 20px;
+ height: 20px;
+ margin-top: -10px;
+ padding: 0;
+
+ cursor: pointer;
+
+ color: transparent;
+ border: none;
+ outline: none;
+ background: transparent;
+}
+.slick-prev:hover,
+.slick-prev:focus,
+.slick-next:hover,
+.slick-next:focus
+{
+ color: transparent;
+ outline: none;
+ background: transparent;
+}
+.slick-prev:hover:before,
+.slick-prev:focus:before,
+.slick-next:hover:before,
+.slick-next:focus:before
+{
+ opacity: 1;
+}
+.slick-prev.slick-disabled:before,
+.slick-next.slick-disabled:before
+{
+ opacity: .25;
+}
+
+.slick-prev:before,
+.slick-next:before
+{
+ font-family: 'slick';
+ font-size: 20px;
+ line-height: 1;
+
+ opacity: .75;
+ color: white;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.slick-prev
+{
+ left: -25px;
+}
+[dir='rtl'] .slick-prev
+{
+ right: -25px;
+ left: auto;
+}
+.slick-prev:before
+{
+ content: '\u2190';
+}
+[dir='rtl'] .slick-prev:before
+{
+ content: '\u2192';
+}
+
+.slick-next
+{
+ right: -25px;
+}
+[dir='rtl'] .slick-next
+{
+ right: auto;
+ left: -25px;
+}
+.slick-next:before
+{
+ content: '\u2192';
+}
+[dir='rtl'] .slick-next:before
+{
+ content: '\u2190';
+}
+
+/* Dots */
+.slick-slider
+{
+ margin-bottom: 30px;
+}
+
+.slick-dots
+{
+ position: absolute;
+ bottom: -45px;
+
+ display: block;
+
+ width: 100%;
+ padding: 0;
+
+ list-style: none;
+
+ text-align: center;
+}
+.slick-dots li
+{
+ position: relative;
+
+ display: inline-block;
+
+ width: 20px;
+ height: 20px;
+ margin: 0 5px;
+ padding: 0;
+
+ cursor: pointer;
+}
+.slick-dots li button
+{
+ font-size: 0;
+ line-height: 0;
+
+ display: block;
+
+ width: 20px;
+ height: 20px;
+ padding: 5px;
+
+ cursor: pointer;
+
+ color: transparent;
+ border: 0;
+ outline: none;
+ background: transparent;
+}
+.slick-dots li button:hover,
+.slick-dots li button:focus
+{
+ outline: none;
+}
+.slick-dots li button:hover:before,
+.slick-dots li button:focus:before
+{
+ opacity: 1;
+}
+.slick-dots li button:before
+{
+ font-family: 'slick';
+ font-size: 6px;
+ line-height: 20px;
+
+ position: absolute;
+ top: 0;
+ left: 0;
+
+ width: 20px;
+ height: 20px;
+
+ content: '\u2022';
+ text-align: center;
+
+ opacity: .25;
+ color: black;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.slick-dots li.slick-active button:before
+{
+ opacity: .75;
+ color: black;
+}
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/slick-theme.scss
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick-theme.scss b/content/css/slick/1.5.0/slick-theme.scss
index e00802b..880a7cb 100644
--- a/content/css/slick/1.5.0/slick-theme.scss
+++ b/content/css/slick/1.5.0/slick-theme.scss
@@ -1,187 +1,187 @@
-@charset "UTF-8";
-
-// Default Variables
-
-$slick-font-path: "./fonts/" !default;
-$slick-font-family: "slick" !default;
-$slick-loader-path: "./" !default;
-$slick-arrow-color: white !default;
-$slick-dot-color: black !default;
-$slick-dot-color-active: $slick-dot-color !default;
-$slick-prev-character: "\u2190" !default;
-$slick-next-character: "\u2192" !default;
-$slick-dot-character: "\u2022" !default;
-$slick-dot-size: 6px !default;
-$slick-opacity-default: 0.75 !default;
-$slick-opacity-on-hover: 1 !default;
-$slick-opacity-not-active: 0.25 !default;
-
-@function slick-image-url($url) {
- @if function-exists(image-url) {
- @return image-url($url);
- }
- @else {
- @return url($slick-loader-path + $url);
- }
-}
-
-@function slick-font-url($url) {
- @if function-exists(font-url) {
- @return font-url($url);
- }
- @else {
- @return url($slick-font-path + $url);
- }
-}
-
-/* Slider */
-
-.slick-list {
- .slick-loading & {
- background: #fff slick-image-url("ajax-loader.gif") center center no-repeat;
- }
-}
-
-/* Icons */
-@if $slick-font-family == "slick" {
- @font-face {
- font-family: "slick";
- src: slick-font-url("slick.eot");
- src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"), slick-font-url("slick.woff") format("woff"), slick-font-url("slick.ttf") format("truetype"), slick-font-url("slick.svg#slick") format("svg");
- font-weight: normal;
- font-style: normal;
- }
-}
-
-/* Arrows */
-
-.slick-prev,
-.slick-next {
- position: absolute;
- display: block;
- height: 20px;
- width: 20px;
- line-height: 0px;
- font-size: 0px;
- cursor: pointer;
- background: transparent;
- color: transparent;
- top: 50%;
- margin-top: -10px;
- padding: 0;
- border: none;
- outline: none;
- &:hover, &:focus {
- outline: none;
- background: transparent;
- color: transparent;
- &:before {
- opacity: $slick-opacity-on-hover;
- }
- }
- &.slick-disabled:before {
- opacity: $slick-opacity-not-active;
- }
-}
-
-.slick-prev:before, .slick-next:before {
- font-family: $slick-font-family;
- font-size: 20px;
- line-height: 1;
- color: $slick-arrow-color;
- opacity: $slick-opacity-default;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.slick-prev {
- left: -25px;
- [dir="rtl"] & {
- left: auto;
- right: -25px;
- }
- &:before {
- content: $slick-prev-character;
- [dir="rtl"] & {
- content: $slick-next-character;
- }
- }
-}
-
-.slick-next {
- right: -25px;
- [dir="rtl"] & {
- left: -25px;
- right: auto;
- }
- &:before {
- content: $slick-next-character;
- [dir="rtl"] & {
- content: $slick-prev-character;
- }
- }
-}
-
-/* Dots */
-
-.slick-slider {
- margin-bottom: 30px;
-}
-
-.slick-dots {
- position: absolute;
- bottom: -45px;
- list-style: none;
- display: block;
- text-align: center;
- padding: 0;
- width: 100%;
- li {
- position: relative;
- display: inline-block;
- height: 20px;
- width: 20px;
- margin: 0 5px;
- padding: 0;
- cursor: pointer;
- button {
- border: 0;
- background: transparent;
- display: block;
- height: 20px;
- width: 20px;
- outline: none;
- line-height: 0px;
- font-size: 0px;
- color: transparent;
- padding: 5px;
- cursor: pointer;
- &:hover, &:focus {
- outline: none;
- &:before {
- opacity: $slick-opacity-on-hover;
- }
- }
- &:before {
- position: absolute;
- top: 0;
- left: 0;
- content: $slick-dot-character;
- width: 20px;
- height: 20px;
- font-family: $slick-font-family;
- font-size: $slick-dot-size;
- line-height: 20px;
- text-align: center;
- color: $slick-dot-color;
- opacity: $slick-opacity-not-active;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
- }
- &.slick-active button:before {
- color: $slick-dot-color-active;
- opacity: $slick-opacity-default;
- }
- }
+@charset "UTF-8";
+
+// Default Variables
+
+$slick-font-path: "./fonts/" !default;
+$slick-font-family: "slick" !default;
+$slick-loader-path: "./" !default;
+$slick-arrow-color: white !default;
+$slick-dot-color: black !default;
+$slick-dot-color-active: $slick-dot-color !default;
+$slick-prev-character: "\u2190" !default;
+$slick-next-character: "\u2192" !default;
+$slick-dot-character: "\u2022" !default;
+$slick-dot-size: 6px !default;
+$slick-opacity-default: 0.75 !default;
+$slick-opacity-on-hover: 1 !default;
+$slick-opacity-not-active: 0.25 !default;
+
+@function slick-image-url($url) {
+ @if function-exists(image-url) {
+ @return image-url($url);
+ }
+ @else {
+ @return url($slick-loader-path + $url);
+ }
+}
+
+@function slick-font-url($url) {
+ @if function-exists(font-url) {
+ @return font-url($url);
+ }
+ @else {
+ @return url($slick-font-path + $url);
+ }
+}
+
+/* Slider */
+
+.slick-list {
+ .slick-loading & {
+ background: #fff slick-image-url("ajax-loader.gif") center center no-repeat;
+ }
+}
+
+/* Icons */
+@if $slick-font-family == "slick" {
+ @font-face {
+ font-family: "slick";
+ src: slick-font-url("slick.eot");
+ src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"), slick-font-url("slick.woff") format("woff"), slick-font-url("slick.ttf") format("truetype"), slick-font-url("slick.svg#slick") format("svg");
+ font-weight: normal;
+ font-style: normal;
+ }
+}
+
+/* Arrows */
+
+.slick-prev,
+.slick-next {
+ position: absolute;
+ display: block;
+ height: 20px;
+ width: 20px;
+ line-height: 0px;
+ font-size: 0px;
+ cursor: pointer;
+ background: transparent;
+ color: transparent;
+ top: 50%;
+ margin-top: -10px;
+ padding: 0;
+ border: none;
+ outline: none;
+ &:hover, &:focus {
+ outline: none;
+ background: transparent;
+ color: transparent;
+ &:before {
+ opacity: $slick-opacity-on-hover;
+ }
+ }
+ &.slick-disabled:before {
+ opacity: $slick-opacity-not-active;
+ }
+}
+
+.slick-prev:before, .slick-next:before {
+ font-family: $slick-font-family;
+ font-size: 20px;
+ line-height: 1;
+ color: $slick-arrow-color;
+ opacity: $slick-opacity-default;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.slick-prev {
+ left: -25px;
+ [dir="rtl"] & {
+ left: auto;
+ right: -25px;
+ }
+ &:before {
+ content: $slick-prev-character;
+ [dir="rtl"] & {
+ content: $slick-next-character;
+ }
+ }
+}
+
+.slick-next {
+ right: -25px;
+ [dir="rtl"] & {
+ left: -25px;
+ right: auto;
+ }
+ &:before {
+ content: $slick-next-character;
+ [dir="rtl"] & {
+ content: $slick-prev-character;
+ }
+ }
+}
+
+/* Dots */
+
+.slick-slider {
+ margin-bottom: 30px;
+}
+
+.slick-dots {
+ position: absolute;
+ bottom: -45px;
+ list-style: none;
+ display: block;
+ text-align: center;
+ padding: 0;
+ width: 100%;
+ li {
+ position: relative;
+ display: inline-block;
+ height: 20px;
+ width: 20px;
+ margin: 0 5px;
+ padding: 0;
+ cursor: pointer;
+ button {
+ border: 0;
+ background: transparent;
+ display: block;
+ height: 20px;
+ width: 20px;
+ outline: none;
+ line-height: 0px;
+ font-size: 0px;
+ color: transparent;
+ padding: 5px;
+ cursor: pointer;
+ &:hover, &:focus {
+ outline: none;
+ &:before {
+ opacity: $slick-opacity-on-hover;
+ }
+ }
+ &:before {
+ position: absolute;
+ top: 0;
+ left: 0;
+ content: $slick-dot-character;
+ width: 20px;
+ height: 20px;
+ font-family: $slick-font-family;
+ font-size: $slick-dot-size;
+ line-height: 20px;
+ text-align: center;
+ color: $slick-dot-color;
+ opacity: $slick-opacity-not-active;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+ }
+ &.slick-active button:before {
+ color: $slick-dot-color-active;
+ opacity: $slick-opacity-default;
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/slick.css
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick.css b/content/css/slick/1.5.0/slick.css
index 59119f4..f597056 100644
--- a/content/css/slick/1.5.0/slick.css
+++ b/content/css/slick/1.5.0/slick.css
@@ -1,116 +1,116 @@
-/* Slider */
-.slick-slider
-{
- position: relative;
-
- display: block;
-
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-
- -webkit-touch-callout: none;
- -khtml-user-select: none;
- -ms-touch-action: pan-y;
- touch-action: pan-y;
- -webkit-tap-highlight-color: transparent;
-}
-
-.slick-list
-{
- position: relative;
-
- display: block;
- overflow: hidden;
-
- margin: 0;
- padding: 0;
-}
-.slick-list:focus
-{
- outline: none;
-}
-.slick-list.dragging
-{
- cursor: pointer;
- cursor: hand;
-}
-
-.slick-slider .slick-track,
-.slick-slider .slick-list
-{
- -webkit-transform: translate3d(0, 0, 0);
- -moz-transform: translate3d(0, 0, 0);
- -ms-transform: translate3d(0, 0, 0);
- -o-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
-}
-
-.slick-track
-{
- position: relative;
- top: 0;
- left: 0;
-
- display: block;
-}
-.slick-track:before,
-.slick-track:after
-{
- display: table;
-
- content: '';
-}
-.slick-track:after
-{
- clear: both;
-}
-.slick-loading .slick-track
-{
- visibility: hidden;
-}
-
-.slick-slide
-{
- display: none;
- float: left;
-
- height: 100%;
- min-height: 1px;
-}
-[dir='rtl'] .slick-slide
-{
- float: right;
-}
-.slick-slide img
-{
- display: block;
-}
-.slick-slide.slick-loading img
-{
- display: none;
-}
-.slick-slide.dragging img
-{
- pointer-events: none;
-}
-.slick-initialized .slick-slide
-{
- display: block;
-}
-.slick-loading .slick-slide
-{
- visibility: hidden;
-}
-.slick-vertical .slick-slide
-{
- display: block;
-
- height: auto;
-
- border: 1px solid transparent;
+/* Slider */
+.slick-slider
+{
+ position: relative;
+
+ display: block;
+
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+
+ -webkit-touch-callout: none;
+ -khtml-user-select: none;
+ -ms-touch-action: pan-y;
+ touch-action: pan-y;
+ -webkit-tap-highlight-color: transparent;
+}
+
+.slick-list
+{
+ position: relative;
+
+ display: block;
+ overflow: hidden;
+
+ margin: 0;
+ padding: 0;
+}
+.slick-list:focus
+{
+ outline: none;
+}
+.slick-list.dragging
+{
+ cursor: pointer;
+ cursor: hand;
+}
+
+.slick-slider .slick-track,
+.slick-slider .slick-list
+{
+ -webkit-transform: translate3d(0, 0, 0);
+ -moz-transform: translate3d(0, 0, 0);
+ -ms-transform: translate3d(0, 0, 0);
+ -o-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+}
+
+.slick-track
+{
+ position: relative;
+ top: 0;
+ left: 0;
+
+ display: block;
+}
+.slick-track:before,
+.slick-track:after
+{
+ display: table;
+
+ content: '';
+}
+.slick-track:after
+{
+ clear: both;
+}
+.slick-loading .slick-track
+{
+ visibility: hidden;
+}
+
+.slick-slide
+{
+ display: none;
+ float: left;
+
+ height: 100%;
+ min-height: 1px;
+}
+[dir='rtl'] .slick-slide
+{
+ float: right;
+}
+.slick-slide img
+{
+ display: block;
+}
+.slick-slide.slick-loading img
+{
+ display: none;
+}
+.slick-slide.dragging img
+{
+ pointer-events: none;
+}
+.slick-initialized .slick-slide
+{
+ display: block;
+}
+.slick-loading .slick-slide
+{
+ visibility: hidden;
+}
+.slick-vertical .slick-slide
+{
+ display: block;
+
+ height: auto;
+
+ border: 1px solid transparent;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/css/slick/1.5.0/slick.scss
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick.scss b/content/css/slick/1.5.0/slick.scss
index 888e760..4cf4ec2 100644
--- a/content/css/slick/1.5.0/slick.scss
+++ b/content/css/slick/1.5.0/slick.scss
@@ -1,96 +1,96 @@
-/* Slider */
-
-.slick-slider {
- position: relative;
- display: block;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- -ms-touch-action: pan-y;
- touch-action: pan-y;
- -webkit-tap-highlight-color: transparent;
-}
-.slick-list {
- position: relative;
- overflow: hidden;
- display: block;
- margin: 0;
- padding: 0;
-
- &:focus {
- outline: none;
- }
-
- &.dragging {
- cursor: pointer;
- cursor: hand;
- }
-}
-.slick-slider .slick-track,
-.slick-slider .slick-list {
- -webkit-transform: translate3d(0, 0, 0);
- -moz-transform: translate3d(0, 0, 0);
- -ms-transform: translate3d(0, 0, 0);
- -o-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
-}
-
-.slick-track {
- position: relative;
- left: 0;
- top: 0;
- display: block;
-
- &:before,
- &:after {
- content: "";
- display: table;
- }
-
- &:after {
- clear: both;
- }
-
- .slick-loading & {
- visibility: hidden;
- }
-}
-.slick-slide {
- float: left;
- height: 100%;
- min-height: 1px;
- [dir="rtl"] & {
- float: right;
- }
- img {
- display: block;
- }
- &.slick-loading img {
- display: none;
- }
-
- display: none;
-
- &.dragging img {
- pointer-events: none;
- }
-
- .slick-initialized & {
- display: block;
- }
-
- .slick-loading & {
- visibility: hidden;
- }
-
- .slick-vertical & {
- display: block;
- height: auto;
- border: 1px solid transparent;
- }
+/* Slider */
+
+.slick-slider {
+ position: relative;
+ display: block;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ -ms-touch-action: pan-y;
+ touch-action: pan-y;
+ -webkit-tap-highlight-color: transparent;
+}
+.slick-list {
+ position: relative;
+ overflow: hidden;
+ display: block;
+ margin: 0;
+ padding: 0;
+
+ &:focus {
+ outline: none;
+ }
+
+ &.dragging {
+ cursor: pointer;
+ cursor: hand;
+ }
+}
+.slick-slider .slick-track,
+.slick-slider .slick-list {
+ -webkit-transform: translate3d(0, 0, 0);
+ -moz-transform: translate3d(0, 0, 0);
+ -ms-transform: translate3d(0, 0, 0);
+ -o-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+}
+
+.slick-track {
+ position: relative;
+ left: 0;
+ top: 0;
+ display: block;
+
+ &:before,
+ &:after {
+ content: "";
+ display: table;
+ }
+
+ &:after {
+ clear: both;
+ }
+
+ .slick-loading & {
+ visibility: hidden;
+ }
+}
+.slick-slide {
+ float: left;
+ height: 100%;
+ min-height: 1px;
+ [dir="rtl"] & {
+ float: right;
+ }
+ img {
+ display: block;
+ }
+ &.slick-loading img {
+ display: none;
+ }
+
+ display: none;
+
+ &.dragging img {
+ pointer-events: none;
+ }
+
+ .slick-initialized & {
+ display: block;
+ }
+
+ .slick-loading & {
+ visibility: hidden;
+ }
+
+ .slick-vertical & {
+ display: block;
+ height: auto;
+ border: 1px solid transparent;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg.html b/content/guides/dg.html
index b536795..3abcfbd 100644
--- a/content/guides/dg.html
+++ b/content/guides/dg.html
@@ -3262,9 +3262,9 @@ WIP - cool new feature
</p><p class="tableblock">* <code>xxx</code> is the bookmark
* <code>ttt</code> is the text to display as the hyperlink
</p><p class="tableblock">for example:
-</p><p class="tableblock"><pre>xref:rgant.adoc#_rgant_aaa_main[Core annotations]</pre></p></td>
+</p><p class="tableblock"><pre>xref:rgant.adoc#_rgant-aaa_main[Core annotations]</pre></p></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="rgant.html#_rgant_aaa_main">Core annotations</a></p>
+<p><a href="rgant.html#_rgant-aaa_main">Core annotations</a></p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><code>adrgcfg</code></p>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/dg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/dg.pdf b/content/guides/dg.pdf
index 6266430..51e63b3 100644
--- a/content/guides/dg.pdf
+++ b/content/guides/dg.pdf
@@ -4,8 +4,8 @@
<< /Title (Developers' Guide)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160429112638+01'00')
-/ModDate (D:20160429112638+01'00')
+/CreationDate (D:20160513191443+01'00')
+/ModDate (D:20160513191443+01'00')
>>
endobj
2 0 obj
@@ -40100,7 +40100,7 @@ endobj
>>
endobj
453 0 obj
-<< /Length 5490
+<< /Length 5545
>>
stream
q
@@ -40118,15 +40118,15 @@ f
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-48.240 402.330 71.257 380.280 re
+48.240 388.050 71.257 394.560 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-119.497 402.330 285.028 380.280 re
+119.497 388.050 285.028 394.560 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-404.525 402.330 142.515 380.280 re
+404.525 388.050 142.515 394.560 re
f
0.000 0.000 0.000 scn
0.5 w
@@ -40243,20 +40243,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-48.240 402.330 m
-119.497 402.330 l
+48.240 388.050 m
+119.497 388.050 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
48.240 782.860 m
-48.240 402.080 l
+48.240 387.800 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 402.080 l
+119.497 387.800 l
S
[ ] 0 d
1 w
@@ -40420,27 +40420,34 @@ ET
BT
51.24 452.703 Td
/F1.0 10.5 Tf
-<616e745f6161615f6d6169> Tj
+<616e742d> Tj
ET
BT
51.24 438.423 Td
/F1.0 10.5 Tf
-<6e5b436f7265> Tj
+<6161615f6d61696e5b436f> Tj
ET
BT
51.24 424.14300000000003 Td
/F1.0 10.5 Tf
-<616e6e6f746174696f6e735d> Tj
+<7265> Tj
ET
BT
51.24 409.86300000000006 Td
/F1.0 10.5 Tf
+<616e6e6f746174696f6e735d> Tj
+ET
+
+
+BT
+51.24 395.5830000000001 Td
+/F1.0 10.5 Tf
<3c2f7072653e> Tj
ET
@@ -40453,20 +40460,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-119.497 402.330 m
-404.525 402.330 l
+119.497 388.050 m
+404.525 388.050 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 402.080 l
+119.497 387.800 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 402.080 l
+404.525 387.800 l
S
[ ] 0 d
1 w
@@ -40492,20 +40499,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-404.525 402.330 m
-547.040 402.330 l
+404.525 388.050 m
+547.040 388.050 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 402.080 l
+404.525 387.800 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
547.040 782.860 m
-547.040 402.080 l
+547.040 387.800 l
S
[ ] 0 d
1 w
@@ -40567,7 +40574,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgant.pdf#_rgant_aaa_main)
+/URI (rgant.pdf#_rgant-aaa_main)
>>
/Subtype /Link
/Rect [122.4970716 763.7969999999999 207.9880716 778.0769999999999]
@@ -40575,7 +40582,7 @@ endobj
>>
endobj
456 0 obj
-<< /Length 5723
+<< /Length 5703
>>
stream
q
@@ -40739,203 +40746,203 @@ S
0.200 0.200 0.200 scn
BT
-51.24 766.8629999999998 Td
+51.24 766.863 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 752.5829999999999 Td
+51.24 752.5830000000001 Td
/F1.0 10.5 Tf
<6366672e61646f6323787878> Tj
ET
BT
-51.24 738.3029999999999 Td
+51.24 738.3030000000001 Td
/F1.0 10.5 Tf
<5b7474745d3c2f7072653e2061> Tj
ET
BT
-51.24 724.0229999999999 Td
+51.24 724.0230000000001 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 709.7429999999999 Td
+51.24 709.7430000000002 Td
/F1.0 10.5 Tf
<6120626f6f6b6d61726b> Tj
ET
BT
-51.24 695.463 Td
+51.24 695.4630000000002 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 681.1829999999999 Td
+51.24 681.1830000000001 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 666.9029999999998 Td
+51.24 666.903 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 652.6229999999998 Td
+51.24 652.623 Td
/F1.0 10.5 Tf
[<636f6e6669677572> 20.01953125 <6174696f>] TJ
ET
BT
-51.24 638.3429999999998 Td
+51.24 638.3430000000001 Td
/F1.0 10.5 Tf
<6e2070726f70657274696573> Tj
ET
BT
-51.24 624.0629999999999 Td
+51.24 624.0630000000001 Td
/F1.0 10.5 Tf
<67756964652c> Tj
ET
BT
-51.24 609.7829999999999 Td
+51.24 609.7830000000001 Td
/F1.0 10.5 Tf
<77686572653a202a> Tj
ET
BT
-51.24 595.5029999999999 Td
+51.24 595.5030000000002 Td
/F1.0 10.5 Tf
<3c636f64653e7878783c2f> Tj
ET
BT
-51.24 581.2229999999998 Td
+51.24 581.2230000000001 Td
/F1.0 10.5 Tf
<636f64653e20697320746865> Tj
ET
BT
-51.24 566.9429999999999 Td
+51.24 566.9430000000001 Td
/F1.0 10.5 Tf
<626f6f6b6d61726b202a> Tj
ET
BT
-51.24 552.6629999999999 Td
+51.24 552.6630000000001 Td
/F1.0 10.5 Tf
<3c636f64653e7474743c2f636f> Tj
ET
BT
-51.24 538.3829999999998 Td
+51.24 538.383 Td
/F1.0 10.5 Tf
<64653e20697320746865> Tj
ET
BT
-51.24 524.1029999999998 Td
+51.24 524.1030000000001 Td
/F1.0 10.5 Tf
<7465787420746f> Tj
ET
BT
-51.24 509.82299999999987 Td
+51.24 509.8230000000001 Td
/F1.0 10.5 Tf
[<646973706c61> 20.01953125 <79206173>] TJ
ET
BT
-51.24 495.5429999999999 Td
+51.24 495.5430000000001 Td
/F1.0 10.5 Tf
<746865> Tj
ET
BT
-51.24 481.2629999999999 Td
+51.24 481.26300000000015 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 466.98299999999995 Td
+51.24 466.9830000000002 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
BT
-51.24 452.703 Td
+51.24 452.7030000000002 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 438.423 Td
+51.24 438.42300000000023 Td
/F1.0 10.5 Tf
<6366672e61646f63235f7267> Tj
ET
BT
-51.24 424.14300000000003 Td
+51.24 424.14300000000026 Td
/F1.0 10.5 Tf
<6366675f636f6e666967757269> Tj
ET
BT
-51.24 409.86300000000006 Td
+51.24 409.8630000000003 Td
/F1.0 10.5 Tf
<6e672d> Tj
ET
BT
-51.24 395.5830000000001 Td
+51.24 395.5830000000003 Td
/F1.0 10.5 Tf
<636f72655b436f6e66696775> Tj
ET
BT
-51.24 381.3030000000001 Td
+51.24 381.30300000000034 Td
/F1.0 10.5 Tf
<72696e67> Tj
ET
BT
-51.24 367.02300000000014 Td
+51.24 367.02300000000037 Td
/F1.0 10.5 Tf
<436f72655d3c2f7072653e> Tj
ET
@@ -40972,7 +40979,7 @@ S
0.259 0.545 0.792 SCN
BT
-122.4970716 766.8629999999998 Td
+122.4970716 766.863 Td
/F1.0 10.5 Tf
<436f6e6669677572696e6720436f7265> Tj
ET
@@ -41011,7 +41018,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0469999999999 Td
+407.52535800000004 769.0470000000001 Td
/F5.0 10.5 Tf
<61647267636d73> Tj
ET
@@ -41066,12 +41073,12 @@ endobj
/URI (rgcfg.pdf#_rgcfg_configuring-core)
>>
/Subtype /Link
-/Rect [122.4970716 763.7969999999999 207.7885716 778.0769999999999]
+/Rect [122.4970716 763.7970000000001 207.7885716 778.0770000000001]
/Type /Annot
>>
endobj
459 0 obj
-<< /Length 5745
+<< /Length 5775
>>
stream
q
@@ -41235,203 +41242,203 @@ S
0.200 0.200 0.200 scn
BT
-51.24 766.8629999999998 Td
+51.24 766.8629999999996 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 752.5829999999999 Td
+51.24 752.5829999999996 Td
/F1.0 10.5 Tf
<636d732e61646f63237878> Tj
ET
BT
-51.24 738.3029999999999 Td
+51.24 738.3029999999997 Td
/F1.0 10.5 Tf
<785b7474745d3c2f7072653e2061> Tj
ET
BT
-51.24 724.0229999999999 Td
+51.24 724.0229999999997 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 709.7429999999999 Td
+51.24 709.7429999999997 Td
/F1.0 10.5 Tf
<6120626f6f6b6d61726b> Tj
ET
BT
-51.24 695.463 Td
+51.24 695.4629999999997 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 681.1829999999999 Td
+51.24 681.1829999999997 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 666.9029999999998 Td
+51.24 666.9029999999996 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 652.6229999999998 Td
+51.24 652.6229999999996 Td
/F1.0 10.5 Tf
<636c61737365732c> Tj
ET
BT
-51.24 638.3429999999998 Td
+51.24 638.3429999999996 Td
/F1.0 10.5 Tf
<6d6574686f647320616e64> Tj
ET
BT
-51.24 624.0629999999999 Td
+51.24 624.0629999999996 Td
/F1.0 10.5 Tf
<736368656d612c> Tj
ET
BT
-51.24 609.7829999999999 Td
+51.24 609.7829999999997 Td
/F1.0 10.5 Tf
<77686572653a202a> Tj
ET
BT
-51.24 595.5029999999999 Td
+51.24 595.5029999999997 Td
/F1.0 10.5 Tf
<3c636f64653e7878783c2f> Tj
ET
BT
-51.24 581.2229999999998 Td
+51.24 581.2229999999996 Td
/F1.0 10.5 Tf
<636f64653e20697320746865> Tj
ET
BT
-51.24 566.9429999999999 Td
+51.24 566.9429999999996 Td
/F1.0 10.5 Tf
<626f6f6b6d61726b202a> Tj
ET
BT
-51.24 552.6629999999999 Td
+51.24 552.6629999999997 Td
/F1.0 10.5 Tf
<3c636f64653e7474743c2f636f> Tj
ET
BT
-51.24 538.3829999999998 Td
+51.24 538.3829999999996 Td
/F1.0 10.5 Tf
<64653e20697320746865> Tj
ET
BT
-51.24 524.1029999999998 Td
+51.24 524.1029999999996 Td
/F1.0 10.5 Tf
<7465787420746f> Tj
ET
BT
-51.24 509.82299999999987 Td
+51.24 509.82299999999964 Td
/F1.0 10.5 Tf
[<646973706c61> 20.01953125 <79206173>] TJ
ET
BT
-51.24 495.5429999999999 Td
+51.24 495.54299999999967 Td
/F1.0 10.5 Tf
<746865> Tj
ET
BT
-51.24 481.2629999999999 Td
+51.24 481.2629999999997 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 466.98299999999995 Td
+51.24 466.9829999999997 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
BT
-51.24 452.703 Td
+51.24 452.70299999999975 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 438.423 Td
+51.24 438.4229999999998 Td
/F1.0 10.5 Tf
<636d732e61646f63235f72> Tj
ET
BT
-51.24 424.14300000000003 Td
+51.24 424.1429999999998 Td
/F1.0 10.5 Tf
<67636d735f636c6173736573> Tj
ET
BT
-51.24 409.86300000000006 Td
+51.24 409.86299999999983 Td
/F1.0 10.5 Tf
<5f73757065725f4162737472> Tj
ET
BT
-51.24 395.5830000000001 Td
+51.24 395.58299999999986 Td
/F1.0 10.5 Tf
<616374536572766963655b60> Tj
ET
BT
-51.24 381.3030000000001 Td
+51.24 381.3029999999999 Td
/F1.0 10.5 Tf
[<4162737472> 20.01953125 <61637453657276>] TJ
ET
BT
-51.24 367.02300000000014 Td
+51.24 367.0229999999999 Td
/F1.0 10.5 Tf
<696365605d3c2f7072653e> Tj
ET
@@ -41468,7 +41475,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 769.0469999999999 Td
+122.4970716 769.0469999999997 Td
/F5.0 10.5 Tf
<416273747261637453657276696365> Tj
ET
@@ -41507,7 +41514,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0469999999999 Td
+407.52535800000004 769.0469999999997 Td
/F5.0 10.5 Tf
<61647267737663> Tj
ET
@@ -41562,12 +41569,12 @@ endobj
/URI (rgcms.pdf#_rgcms_classes_super_AbstractService)
>>
/Subtype /Link
-/Rect [122.4970716 767.5769999999999 201.2470716 778.0769999999999]
+/Rect [122.4970716 767.5769999999997 201.2470716 778.0769999999997]
/Type /Annot
>>
endobj
462 0 obj
-<< /Length 6036
+<< /Length 6006
>>
stream
q
@@ -41731,210 +41738,210 @@ S
0.200 0.200 0.200 scn
BT
-51.24 766.8629999999996 Td
+51.24 766.8629999999998 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 752.5829999999996 Td
+51.24 752.5829999999999 Td
/F1.0 10.5 Tf
<7376632e61646f6323787878> Tj
ET
BT
-51.24 738.3029999999997 Td
+51.24 738.3029999999999 Td
/F1.0 10.5 Tf
<5b7474745d3c2f7072653e2061> Tj
ET
BT
-51.24 724.0229999999997 Td
+51.24 724.0229999999999 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 709.7429999999997 Td
+51.24 709.7429999999999 Td
/F1.0 10.5 Tf
<6120626f6f6b6d61726b> Tj
ET
BT
-51.24 695.4629999999997 Td
+51.24 695.463 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 681.1829999999997 Td
+51.24 681.1829999999999 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 666.9029999999996 Td
+51.24 666.9029999999998 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 652.6229999999996 Td
+51.24 652.6229999999998 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 638.3429999999996 Td
+51.24 638.3429999999998 Td
/F1.0 10.5 Tf
<73657276696365732c> Tj
ET
BT
-51.24 624.0629999999996 Td
+51.24 624.0629999999999 Td
/F1.0 10.5 Tf
<77686572653a202a> Tj
ET
BT
-51.24 609.7829999999997 Td
+51.24 609.7829999999999 Td
/F1.0 10.5 Tf
<3c636f64653e7878783c2f> Tj
ET
BT
-51.24 595.5029999999997 Td
+51.24 595.5029999999999 Td
/F1.0 10.5 Tf
<636f64653e20697320746865> Tj
ET
BT
-51.24 581.2229999999996 Td
+51.24 581.2229999999998 Td
/F1.0 10.5 Tf
<626f6f6b6d61726b202a> Tj
ET
BT
-51.24 566.9429999999996 Td
+51.24 566.9429999999999 Td
/F1.0 10.5 Tf
<3c636f64653e7474743c2f636f> Tj
ET
BT
-51.24 552.6629999999997 Td
+51.24 552.6629999999999 Td
/F1.0 10.5 Tf
<64653e20697320746865> Tj
ET
BT
-51.24 538.3829999999996 Td
+51.24 538.3829999999998 Td
/F1.0 10.5 Tf
<7465787420746f> Tj
ET
BT
-51.24 524.1029999999996 Td
+51.24 524.1029999999998 Td
/F1.0 10.5 Tf
[<646973706c61> 20.01953125 <79206173>] TJ
ET
BT
-51.24 509.82299999999964 Td
+51.24 509.82299999999987 Td
/F1.0 10.5 Tf
<746865> Tj
ET
BT
-51.24 495.54299999999967 Td
+51.24 495.5429999999999 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 481.2629999999997 Td
+51.24 481.2629999999999 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
BT
-51.24 466.9829999999997 Td
+51.24 466.98299999999995 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 452.70299999999975 Td
+51.24 452.703 Td
/F1.0 10.5 Tf
<7376632e61646f63235f7267> Tj
ET
BT
-51.24 438.4229999999998 Td
+51.24 438.423 Td
/F1.0 10.5 Tf
<636d735f636c61737365735f> Tj
ET
BT
-51.24 424.1429999999998 Td
+51.24 424.14300000000003 Td
/F1.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
BT
-51.24 409.86299999999983 Td
+51.24 409.86300000000006 Td
/F1.0 10.5 Tf
[<2d626f6f74737472> 20.01953125 <61707069>] TJ
ET
BT
-51.24 395.58299999999986 Td
+51.24 395.5830000000001 Td
/F1.0 10.5 Tf
<6e675b604170704d616e> Tj
ET
BT
-51.24 381.3029999999999 Td
+51.24 381.3030000000001 Td
/F1.0 10.5 Tf
<696665737460> Tj
ET
BT
-51.24 367.0229999999999 Td
+51.24 367.02300000000014 Td
/F1.0 10.5 Tf
[<626f6f74737472> 20.01953125 <617070696e>] TJ
ET
BT
-51.24 352.74299999999994 Td
+51.24 352.74300000000017 Td
/F1.0 10.5 Tf
<675d3c2f7072653e> Tj
ET
@@ -41971,7 +41978,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 766.8629999999996 Td
+122.4970716 766.8629999999998 Td
/F5.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -41982,7 +41989,7 @@ ET
0.259 0.545 0.792 SCN
BT
-180.2470716 766.8629999999996 Td
+180.2470716 766.8629999999998 Td
/F1.0 10.5 Tf
[<20626f6f74737472> 20.01953125 <617070696e67>] TJ
ET
@@ -42021,7 +42028,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0469999999997 Td
+407.52535800000004 769.0469999999999 Td
/F5.0 10.5 Tf
<616472676d766e> Tj
ET
@@ -42076,7 +42083,7 @@ endobj
/URI (xref:rgsvc.pdf#_rgcms_classes_AppManifest-bootstrapping)
>>
/Subtype /Link
-/Rect [122.4970716 765.3929999999996 180.2470716 775.8929999999996]
+/Rect [122.4970716 765.3929999999998 180.2470716 775.8929999999998]
/Type /Annot
>>
endobj
@@ -42087,7 +42094,7 @@ endobj
/URI (xref:rgsvc.pdf#_rgcms_classes_AppManifest-bootstrapping)
>>
/Subtype /Link
-/Rect [180.2470716 763.7969999999997 252.92786652187502 778.0769999999997]
+/Rect [180.2470716 763.7969999999999 252.92786652187502 778.0769999999999]
/Type /Annot
>>
endobj
@@ -43608,7 +43615,7 @@ endobj
>>
endobj
475 0 obj
-<< /Length 5664
+<< /Length 5704
>>
stream
q
@@ -43772,203 +43779,203 @@ S
0.200 0.200 0.200 scn
BT
-51.24 766.863 Td
+51.24 766.8630000000005 Td
/F1.0 10.5 Tf
<3c7072653e3c2f7072653e> Tj
ET
BT
-51.24 752.5830000000001 Td
+51.24 752.5830000000005 Td
/F1.0 10.5 Tf
[<612068> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 738.3030000000001 Td
+51.24 738.3030000000006 Td
/F1.0 10.5 Tf
<746f2074686520226d616e> Tj
ET
BT
-51.24 724.0230000000001 Td
+51.24 724.0230000000006 Td
/F1.0 10.5 Tf
<706167652220666f7220616e> Tj
ET
BT
-51.24 709.7430000000002 Td
+51.24 709.7430000000006 Td
/F1.0 10.5 Tf
<284150492920646f6d61696e> Tj
ET
BT
-51.24 695.4630000000002 Td
+51.24 695.4630000000006 Td
/F1.0 10.5 Tf
<73657276696365> Tj
ET
BT
-51.24 681.1830000000001 Td
+51.24 681.1830000000006 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 666.903 Td
+51.24 666.9030000000005 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 652.623 Td
+51.24 652.6230000000005 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 638.3430000000001 Td
+51.24 638.3430000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 624.0630000000001 Td
+51.24 624.0630000000006 Td
/F1.0 10.5 Tf
<73657276696365732c> Tj
ET
BT
-51.24 609.7830000000001 Td
+51.24 609.7830000000006 Td
/F1.0 10.5 Tf
<77686572653a202a> Tj
ET
BT
-51.24 595.5030000000002 Td
+51.24 595.5030000000006 Td
/F1.0 10.5 Tf
<3c636f64653e7878783c2f> Tj
ET
BT
-51.24 581.2230000000001 Td
+51.24 581.2230000000005 Td
/F1.0 10.5 Tf
<636f64653e20697320746865> Tj
ET
BT
-51.24 566.9430000000001 Td
+51.24 566.9430000000006 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 552.6630000000001 Td
+51.24 552.6630000000006 Td
/F1.0 10.5 Tf
<7365727669636520286567> Tj
ET
BT
-51.24 538.383 Td
+51.24 538.3830000000005 Td
/F1.0 10.5 Tf
<3c636f64653e446f6d61> Tj
ET
BT
-51.24 524.1030000000001 Td
+51.24 524.1030000000005 Td
/F1.0 10.5 Tf
<696e4f626a656374436f6e74> Tj
ET
BT
-51.24 509.8230000000001 Td
+51.24 509.82300000000055 Td
/F1.0 10.5 Tf
<61696e65723c2f636f64653e> Tj
ET
BT
-51.24 495.5430000000001 Td
+51.24 495.5430000000006 Td
/F1.0 10.5 Tf
<2920666f72> Tj
ET
BT
-51.24 481.26300000000015 Td
+51.24 481.2630000000006 Td
/F1.0 10.5 Tf
<6578616d706c653a> Tj
ET
BT
-51.24 466.9830000000002 Td
+51.24 466.98300000000063 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 452.7030000000002 Td
+51.24 452.70300000000066 Td
/F1.0 10.5 Tf
<7376632e61646f63235f7267> Tj
ET
BT
-51.24 438.42300000000023 Td
+51.24 438.4230000000007 Td
/F1.0 10.5 Tf
<7376635f6170695f446f6d> Tj
ET
BT
-51.24 424.14300000000026 Td
+51.24 424.1430000000007 Td
/F1.0 10.5 Tf
<61696e4f626a656374436f> Tj
ET
BT
-51.24 409.8630000000003 Td
+51.24 409.86300000000074 Td
/F1.0 10.5 Tf
<6e7461696e65725b60446f> Tj
ET
BT
-51.24 395.5830000000003 Td
+51.24 395.58300000000077 Td
/F1.0 10.5 Tf
<6d61696e4f626a65637443> Tj
ET
BT
-51.24 381.30300000000034 Td
+51.24 381.3030000000008 Td
/F1.0 10.5 Tf
<6f6e7461696e6572605d3c2f> Tj
ET
BT
-51.24 367.02300000000037 Td
+51.24 367.0230000000008 Td
/F1.0 10.5 Tf
<7072653e> Tj
ET
@@ -44005,7 +44012,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 769.0470000000001 Td
+122.4970716 769.0470000000006 Td
/F5.0 10.5 Tf
<446f6d61696e4f626a656374436f6e7461696e6572> Tj
ET
@@ -44044,7 +44051,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0470000000001 Td
+407.52535800000004 769.0470000000006 Td
/F5.0 10.5 Tf
<616472677373> Tj
ET
@@ -44099,12 +44106,12 @@ endobj
/URI (rgsvc.pdf#_rgsvc_api_DomainObjectContainer)
>>
/Subtype /Link
-/Rect [122.4970716 767.5770000000001 232.7470716 778.0770000000001]
+/Rect [122.4970716 767.5770000000006 232.7470716 778.0770000000006]
/Type /Annot
>>
endobj
478 0 obj
-<< /Length 5668
+<< /Length 5708
>>
stream
q
@@ -44268,203 +44275,203 @@ S
0.200 0.200 0.200 scn
BT
-51.24 766.863 Td
+51.24 766.8630000000005 Td
/F1.0 10.5 Tf
<3c7072653e3c2f7072653e> Tj
ET
BT
-51.24 752.5830000000001 Td
+51.24 752.5830000000005 Td
/F1.0 10.5 Tf
[<612068> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 738.3030000000001 Td
+51.24 738.3030000000006 Td
/F1.0 10.5 Tf
<746f2074686520226d616e> Tj
ET
BT
-51.24 724.0230000000001 Td
+51.24 724.0230000000006 Td
/F1.0 10.5 Tf
<706167652220666f7220616e> Tj
ET
BT
-51.24 709.7430000000002 Td
+51.24 709.7430000000006 Td
/F1.0 10.5 Tf
<285350492920646f6d61696e> Tj
ET
BT
-51.24 695.4630000000002 Td
+51.24 695.4630000000006 Td
/F1.0 10.5 Tf
<73657276696365> Tj
ET
BT
-51.24 681.1830000000001 Td
+51.24 681.1830000000006 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 666.903 Td
+51.24 666.9030000000005 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 652.623 Td
+51.24 652.6230000000005 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 638.3430000000001 Td
+51.24 638.3430000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 624.0630000000001 Td
+51.24 624.0630000000006 Td
/F1.0 10.5 Tf
<73657276696365732c> Tj
ET
BT
-51.24 609.7830000000001 Td
+51.24 609.7830000000006 Td
/F1.0 10.5 Tf
<77686572653a202a> Tj
ET
BT
-51.24 595.5030000000002 Td
+51.24 595.5030000000006 Td
/F1.0 10.5 Tf
<3c636f64653e7878783c2f> Tj
ET
BT
-51.24 581.2230000000001 Td
+51.24 581.2230000000005 Td
/F1.0 10.5 Tf
<636f64653e20697320746865> Tj
ET
BT
-51.24 566.9430000000001 Td
+51.24 566.9430000000006 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 552.6630000000001 Td
+51.24 552.6630000000006 Td
/F1.0 10.5 Tf
<7365727669636520286567> Tj
ET
BT
-51.24 538.383 Td
+51.24 538.3830000000005 Td
/F1.0 10.5 Tf
<3c636f64653e436f6e7465> Tj
ET
BT
-51.24 524.1030000000001 Td
+51.24 524.1030000000005 Td
/F1.0 10.5 Tf
<6e744d617070696e675365> Tj
ET
BT
-51.24 509.8230000000001 Td
+51.24 509.82300000000055 Td
/F1.0 10.5 Tf
<72766963653c2f636f64653e> Tj
ET
BT
-51.24 495.5430000000001 Td
+51.24 495.5430000000006 Td
/F1.0 10.5 Tf
<2920666f72> Tj
ET
BT
-51.24 481.26300000000015 Td
+51.24 481.2630000000006 Td
/F1.0 10.5 Tf
<6578616d706c653a> Tj
ET
BT
-51.24 466.9830000000002 Td
+51.24 466.98300000000063 Td
/F1.0 10.5 Tf
<3c7072653e787265663a7267> Tj
ET
BT
-51.24 452.7030000000002 Td
+51.24 452.70300000000066 Td
/F1.0 10.5 Tf
<7376632e61646f63235f7267> Tj
ET
BT
-51.24 438.42300000000023 Td
+51.24 438.4230000000007 Td
/F1.0 10.5 Tf
<7376635f7370695f436f6e74> Tj
ET
BT
-51.24 424.14300000000026 Td
+51.24 424.1430000000007 Td
/F1.0 10.5 Tf
<656e744d617070696e6753> Tj
ET
BT
-51.24 409.8630000000003 Td
+51.24 409.86300000000074 Td
/F1.0 10.5 Tf
<6572766963655b60436f6e74> Tj
ET
BT
-51.24 395.5830000000003 Td
+51.24 395.58300000000077 Td
/F1.0 10.5 Tf
<656e744d617070696e6753> Tj
ET
BT
-51.24 381.30300000000034 Td
+51.24 381.3030000000008 Td
/F1.0 10.5 Tf
<657276696365605d3c2f7072> Tj
ET
BT
-51.24 367.02300000000037 Td
+51.24 367.0230000000008 Td
/F1.0 10.5 Tf
<653e> Tj
ET
@@ -44501,7 +44508,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 769.0470000000001 Td
+122.4970716 769.0470000000006 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -44540,7 +44547,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0470000000001 Td
+407.52535800000004 769.0470000000006 Td
/F5.0 10.5 Tf
<6164756766756e> Tj
ET
@@ -44595,7 +44602,7 @@ endobj
/URI (rgsvc.pdf#_rgsvc_spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [122.4970716 767.5770000000001 232.7470716 778.0770000000001]
+/Rect [122.4970716 767.5770000000006 232.7470716 778.0770000000006]
/Type /Annot
>>
endobj
@@ -56456,293 +56463,293 @@ xref
0002710866 00000 n
0002711125 00000 n
0002711288 00000 n
-0002716832 00000 n
-0002717091 00000 n
-0002717290 00000 n
-0002723067 00000 n
-0002723326 00000 n
-0002723533 00000 n
-0002729332 00000 n
-0002729591 00000 n
-0002729811 00000 n
-0002735901 00000 n
-0002736168 00000 n
-0002736397 00000 n
-0002736633 00000 n
-0002742255 00000 n
-0002742514 00000 n
-0002742713 00000 n
-0002748290 00000 n
-0002748549 00000 n
-0002748746 00000 n
-0002755247 00000 n
-0002755506 00000 n
-0002755713 00000 n
-0002761431 00000 n
-0002761690 00000 n
-0002761906 00000 n
-0002767628 00000 n
-0002767887 00000 n
-0002768103 00000 n
-0002773855 00000 n
-0002774114 00000 n
-0002774325 00000 n
-0002780061 00000 n
-0002780320 00000 n
-0002780522 00000 n
-0002786437 00000 n
-0002786696 00000 n
-0002786894 00000 n
-0002792738 00000 n
-0002792997 00000 n
-0002793205 00000 n
-0002806379 00000 n
-0002806670 00000 n
-0002806877 00000 n
-0002806935 00000 n
-0002807131 00000 n
-0002807339 00000 n
-0002807566 00000 n
-0002807801 00000 n
-0002836394 00000 n
-0002836677 00000 n
-0002836906 00000 n
-0002837133 00000 n
-0002837339 00000 n
-0002837553 00000 n
-0002837599 00000 n
-0002837657 00000 n
-0002862540 00000 n
-0002862781 00000 n
-0002862827 00000 n
-0002862873 00000 n
-0002862931 00000 n
-0002873534 00000 n
-0002873793 00000 n
-0002873983 00000 n
-0002892238 00000 n
-0002892591 00000 n
-0002892637 00000 n
-0002892817 00000 n
-0002893015 00000 n
-0002893219 00000 n
-0002893412 00000 n
-0002893611 00000 n
-0002893804 00000 n
-0002894005 00000 n
-0002894201 00000 n
-0002894406 00000 n
-0002894452 00000 n
-0002894653 00000 n
-0002894870 00000 n
-0002906213 00000 n
-0002906493 00000 n
-0002906539 00000 n
-0002906725 00000 n
-0002906956 00000 n
-0002907082 00000 n
-0002907199 00000 n
-0002907324 00000 n
-0002907450 00000 n
-0002907591 00000 n
-0002907723 00000 n
-0002907863 00000 n
-0002908004 00000 n
-0002908153 00000 n
-0002908302 00000 n
-0002908442 00000 n
-0002908593 00000 n
-0002908748 00000 n
-0002908914 00000 n
-0002909092 00000 n
-0002909270 00000 n
-0002909439 00000 n
-0002909618 00000 n
-0002909798 00000 n
-0002909988 00000 n
-0002910179 00000 n
-0002910370 00000 n
-0002910560 00000 n
-0002910760 00000 n
-0002910917 00000 n
-0002911074 00000 n
-0002911232 00000 n
-0002911400 00000 n
-0002911553 00000 n
-0002911716 00000 n
-0002911867 00000 n
-0002912028 00000 n
-0002912202 00000 n
-0002912376 00000 n
-0002912549 00000 n
-0002912722 00000 n
-0002912885 00000 n
-0002913048 00000 n
-0002913199 00000 n
-0002913361 00000 n
-0002913533 00000 n
-0002913705 00000 n
-0002913882 00000 n
-0002914061 00000 n
-0002914233 00000 n
-0002914405 00000 n
-0002914556 00000 n
-0002914718 00000 n
-0002914887 00000 n
-0002915056 00000 n
-0002915227 00000 n
-0002915400 00000 n
-0002915566 00000 n
-0002915743 00000 n
-0002915896 00000 n
-0002916059 00000 n
-0002916230 00000 n
-0002916401 00000 n
-0002916564 00000 n
-0002916727 00000 n
-0002916886 00000 n
-0002917045 00000 n
-0002917214 00000 n
-0002917383 00000 n
-0002917542 00000 n
-0002917703 00000 n
-0002917875 00000 n
-0002918047 00000 n
-0002918223 00000 n
-0002918399 00000 n
-0002918548 00000 n
-0002918709 00000 n
-0002918866 00000 n
-0002919034 00000 n
-0002919235 00000 n
-0002919447 00000 n
-0002919659 00000 n
-0002919871 00000 n
-0002920062 00000 n
-0002920264 00000 n
-0002920418 00000 n
-0002920574 00000 n
-0002920716 00000 n
-0002920858 00000 n
-0002921011 00000 n
-0002921166 00000 n
-0002921314 00000 n
-0002921473 00000 n
-0002921635 00000 n
-0002921799 00000 n
-0002921945 00000 n
-0002922101 00000 n
-0002922241 00000 n
-0002922392 00000 n
-0002922556 00000 n
-0002922720 00000 n
-0002922871 00000 n
-0002923022 00000 n
-0002923171 00000 n
-0002923320 00000 n
-0002923483 00000 n
-0002923646 00000 n
-0002923796 00000 n
-0002923956 00000 n
-0002924111 00000 n
-0002924266 00000 n
-0002924553 00000 n
-0002924631 00000 n
-0002924808 00000 n
-0002925000 00000 n
-0002925265 00000 n
-0002925440 00000 n
-0002925685 00000 n
-0002925946 00000 n
-0002926173 00000 n
-0002926451 00000 n
-0002926605 00000 n
-0002926822 00000 n
-0002927042 00000 n
-0002927295 00000 n
-0002927564 00000 n
-0002927855 00000 n
-0002928141 00000 n
-0002928371 00000 n
-0002928599 00000 n
-0002928808 00000 n
-0002929084 00000 n
-0002929352 00000 n
-0002929563 00000 n
-0002929809 00000 n
-0002930067 00000 n
-0002930363 00000 n
-0002930612 00000 n
-0002930829 00000 n
-0002931077 00000 n
-0002931345 00000 n
-0002931615 00000 n
-0002931902 00000 n
-0002932140 00000 n
-0002932360 00000 n
-0002932573 00000 n
-0002932814 00000 n
-0002933023 00000 n
-0002933279 00000 n
-0002933556 00000 n
-0002933768 00000 n
-0002934016 00000 n
-0002934349 00000 n
-0002934731 00000 n
-0002935041 00000 n
-0002935215 00000 n
-0002935411 00000 n
-0002935624 00000 n
-0002935857 00000 n
-0002936046 00000 n
-0002936227 00000 n
-0002936456 00000 n
-0002936625 00000 n
-0002936788 00000 n
-0002937082 00000 n
-0002937259 00000 n
-0002937478 00000 n
-0002937978 00000 n
-0002947736 00000 n
-0002947952 00000 n
-0002949315 00000 n
-0002950361 00000 n
-0002958983 00000 n
-0002959204 00000 n
-0002960567 00000 n
-0002961636 00000 n
-0002962994 00000 n
-0002963205 00000 n
-0002963520 00000 n
-0002964436 00000 n
-0002970397 00000 n
-0002970623 00000 n
-0002971986 00000 n
-0002973069 00000 n
-0002979014 00000 n
-0002979228 00000 n
-0002980591 00000 n
-0002981640 00000 n
-0002985053 00000 n
-0002985264 00000 n
-0002986627 00000 n
-0002987726 00000 n
-0002989447 00000 n
-0002989660 00000 n
-0002991023 00000 n
-0002992156 00000 n
-0002993627 00000 n
-0002993841 00000 n
-0002994145 00000 n
-0002995283 00000 n
-0002996745 00000 n
-0002996963 00000 n
-0002998326 00000 n
+0002716887 00000 n
+0002717146 00000 n
+0002717345 00000 n
+0002723102 00000 n
+0002723361 00000 n
+0002723568 00000 n
+0002729397 00000 n
+0002729656 00000 n
+0002729876 00000 n
+0002735936 00000 n
+0002736203 00000 n
+0002736432 00000 n
+0002736668 00000 n
+0002742290 00000 n
+0002742549 00000 n
+0002742748 00000 n
+0002748325 00000 n
+0002748584 00000 n
+0002748781 00000 n
+0002755282 00000 n
+0002755541 00000 n
+0002755748 00000 n
+0002761506 00000 n
+0002761765 00000 n
+0002761981 00000 n
+0002767743 00000 n
+0002768002 00000 n
+0002768218 00000 n
+0002773970 00000 n
+0002774229 00000 n
+0002774440 00000 n
+0002780176 00000 n
+0002780435 00000 n
+0002780637 00000 n
+0002786552 00000 n
+0002786811 00000 n
+0002787009 00000 n
+0002792853 00000 n
+0002793112 00000 n
+0002793320 00000 n
+0002806494 00000 n
+0002806785 00000 n
+0002806992 00000 n
+0002807050 00000 n
+0002807246 00000 n
+0002807454 00000 n
+0002807681 00000 n
+0002807916 00000 n
+0002836509 00000 n
+0002836792 00000 n
+0002837021 00000 n
+0002837248 00000 n
+0002837454 00000 n
+0002837668 00000 n
+0002837714 00000 n
+0002837772 00000 n
+0002862655 00000 n
+0002862896 00000 n
+0002862942 00000 n
+0002862988 00000 n
+0002863046 00000 n
+0002873649 00000 n
+0002873908 00000 n
+0002874098 00000 n
+0002892353 00000 n
+0002892706 00000 n
+0002892752 00000 n
+0002892932 00000 n
+0002893130 00000 n
+0002893334 00000 n
+0002893527 00000 n
+0002893726 00000 n
+0002893919 00000 n
+0002894120 00000 n
+0002894316 00000 n
+0002894521 00000 n
+0002894567 00000 n
+0002894768 00000 n
+0002894985 00000 n
+0002906328 00000 n
+0002906608 00000 n
+0002906654 00000 n
+0002906840 00000 n
+0002907071 00000 n
+0002907197 00000 n
+0002907314 00000 n
+0002907439 00000 n
+0002907565 00000 n
+0002907706 00000 n
+0002907838 00000 n
+0002907978 00000 n
+0002908119 00000 n
+0002908268 00000 n
+0002908417 00000 n
+0002908557 00000 n
+0002908708 00000 n
+0002908863 00000 n
+0002909029 00000 n
+0002909207 00000 n
+0002909385 00000 n
+0002909554 00000 n
+0002909733 00000 n
+0002909913 00000 n
+0002910103 00000 n
+0002910294 00000 n
+0002910485 00000 n
+0002910675 00000 n
+0002910875 00000 n
+0002911032 00000 n
+0002911189 00000 n
+0002911347 00000 n
+0002911515 00000 n
+0002911668 00000 n
+0002911831 00000 n
+0002911982 00000 n
+0002912143 00000 n
+0002912317 00000 n
+0002912491 00000 n
+0002912664 00000 n
+0002912837 00000 n
+0002913000 00000 n
+0002913163 00000 n
+0002913314 00000 n
+0002913476 00000 n
+0002913648 00000 n
+0002913820 00000 n
+0002913997 00000 n
+0002914176 00000 n
+0002914348 00000 n
+0002914520 00000 n
+0002914671 00000 n
+0002914833 00000 n
+0002915002 00000 n
+0002915171 00000 n
+0002915342 00000 n
+0002915515 00000 n
+0002915681 00000 n
+0002915858 00000 n
+0002916011 00000 n
+0002916174 00000 n
+0002916345 00000 n
+0002916516 00000 n
+0002916679 00000 n
+0002916842 00000 n
+0002917001 00000 n
+0002917160 00000 n
+0002917329 00000 n
+0002917498 00000 n
+0002917657 00000 n
+0002917818 00000 n
+0002917990 00000 n
+0002918162 00000 n
+0002918338 00000 n
+0002918514 00000 n
+0002918663 00000 n
+0002918824 00000 n
+0002918981 00000 n
+0002919149 00000 n
+0002919350 00000 n
+0002919562 00000 n
+0002919774 00000 n
+0002919986 00000 n
+0002920177 00000 n
+0002920379 00000 n
+0002920533 00000 n
+0002920689 00000 n
+0002920831 00000 n
+0002920973 00000 n
+0002921126 00000 n
+0002921281 00000 n
+0002921429 00000 n
+0002921588 00000 n
+0002921750 00000 n
+0002921914 00000 n
+0002922060 00000 n
+0002922216 00000 n
+0002922356 00000 n
+0002922507 00000 n
+0002922671 00000 n
+0002922835 00000 n
+0002922986 00000 n
+0002923137 00000 n
+0002923286 00000 n
+0002923435 00000 n
+0002923598 00000 n
+0002923761 00000 n
+0002923911 00000 n
+0002924071 00000 n
+0002924226 00000 n
+0002924381 00000 n
+0002924668 00000 n
+0002924746 00000 n
+0002924923 00000 n
+0002925115 00000 n
+0002925380 00000 n
+0002925555 00000 n
+0002925800 00000 n
+0002926061 00000 n
+0002926288 00000 n
+0002926566 00000 n
+0002926720 00000 n
+0002926937 00000 n
+0002927157 00000 n
+0002927410 00000 n
+0002927679 00000 n
+0002927970 00000 n
+0002928256 00000 n
+0002928486 00000 n
+0002928714 00000 n
+0002928923 00000 n
+0002929199 00000 n
+0002929467 00000 n
+0002929678 00000 n
+0002929924 00000 n
+0002930182 00000 n
+0002930478 00000 n
+0002930727 00000 n
+0002930944 00000 n
+0002931192 00000 n
+0002931460 00000 n
+0002931730 00000 n
+0002932017 00000 n
+0002932255 00000 n
+0002932475 00000 n
+0002932688 00000 n
+0002932929 00000 n
+0002933138 00000 n
+0002933394 00000 n
+0002933671 00000 n
+0002933883 00000 n
+0002934131 00000 n
+0002934464 00000 n
+0002934846 00000 n
+0002935156 00000 n
+0002935330 00000 n
+0002935526 00000 n
+0002935739 00000 n
+0002935972 00000 n
+0002936161 00000 n
+0002936342 00000 n
+0002936571 00000 n
+0002936740 00000 n
+0002936903 00000 n
+0002937197 00000 n
+0002937374 00000 n
+0002937593 00000 n
+0002938093 00000 n
+0002947851 00000 n
+0002948067 00000 n
+0002949430 00000 n
+0002950476 00000 n
+0002959098 00000 n
+0002959319 00000 n
+0002960682 00000 n
+0002961751 00000 n
+0002963109 00000 n
+0002963320 00000 n
+0002963635 00000 n
+0002964551 00000 n
+0002970512 00000 n
+0002970738 00000 n
+0002972101 00000 n
+0002973184 00000 n
+0002979129 00000 n
+0002979343 00000 n
+0002980706 00000 n
+0002981755 00000 n
+0002985168 00000 n
+0002985379 00000 n
+0002986742 00000 n
+0002987841 00000 n
+0002989562 00000 n
+0002989775 00000 n
+0002991138 00000 n
+0002992271 00000 n
+0002993742 00000 n
+0002993956 00000 n
+0002994260 00000 n
+0002995398 00000 n
+0002996860 00000 n
+0002997078 00000 n
+0002998441 00000 n
trailer
<< /Size 736
/Root 2 0 R
/Info 1 0 R
>>
startxref
-2999463
+2999578
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/images/reference-services/commands-and-events.png
----------------------------------------------------------------------
diff --git a/content/guides/images/reference-services/commands-and-events.png b/content/guides/images/reference-services/commands-and-events.png
new file mode 100644
index 0000000..733b577
Binary files /dev/null and b/content/guides/images/reference-services/commands-and-events.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/images/reference-services/commands-and-events.pptx
----------------------------------------------------------------------
diff --git a/content/guides/images/reference-services/commands-and-events.pptx b/content/guides/images/reference-services/commands-and-events.pptx
new file mode 100644
index 0000000..c454636
Binary files /dev/null and b/content/guides/images/reference-services/commands-and-events.pptx differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgant.html
----------------------------------------------------------------------
diff --git a/content/guides/rgant.html b/content/guides/rgant.html
index 73c25c8..265ef18 100644
--- a/content/guides/rgant.html
+++ b/content/guides/rgant.html
@@ -1103,7 +1103,7 @@ For use with <code>@ViewModel</code>. If specifying view models using <code>@Dom
<p>As Apache Isis has evolved and grown, we found ourselves adding more and more annotations; but most of these related to either an object type (entity, view model, service) or an object member (property, collection, action). Over time it became harder and harder for end programmers to discover these new features.</p>
</div>
<div class="paragraph">
-<p>Accordingly, (in v1.8.0) we decided to unify the semantics into the main (core) annotations listed <a href="#_rgant_aaa_main">above</a>.</p>
+<p>Accordingly, (in v1.8.0) we decided to unify the semantics into the main (core) annotations listed <a href="#_rgant-aaa_main">above</a>.</p>
</div>
<div class="paragraph">
<p>The annotations listed in the table below are still supported by Apache Isis, but will be retired in Apache Isis v2.0.</p>
@@ -9049,7 +9049,7 @@ declaration.</p>
<p>Unlike most other aspects of the Apache Isis metamodel, the name of method parameters cannot (prior to Java 8, at least) be inferred from the Java source code. Without other information, Apache Isis uses the object’s type (<code>int</code>, <code>String</code> etc) as the name instead. This can be sufficient for application-specific reference types (eg <code>ToDoItem</code>) but is generally not sufficient for primitives and other value types.</p>
</div>
<div class="paragraph">
-<p>The <code>named()</code> attribute (or the <a href="#_rgant_aaa_deprecated">deprecated <code>@Named</code></a> annotation) is therefore often required to specify the parameter name.</p>
+<p>The <code>named()</code> attribute (or the <a href="#_rgant-aaa_deprecated">deprecated <code>@Named</code></a> annotation) is therefore often required to specify the parameter name.</p>
</div>
<div class="paragraph">
<p>As of Java 8, the Java reflection API has been extended. The (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> metamodel extension provides support for this. Note that your application must (obviously) be running on Java 8, and be compiled with the <code>-parameters</code> compile flag for javac.</p>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgant.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgant.pdf b/content/guides/rgant.pdf
index 5d15768..7055c74 100644
--- a/content/guides/rgant.pdf
+++ b/content/guides/rgant.pdf
@@ -4,8 +4,8 @@
<< /Title (Annotations)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160426190239+01'00')
-/ModDate (D:20160426190239+01'00')
+/CreationDate (D:20160513191450+01'00')
+/ModDate (D:20160513191450+01'00')
>>
endobj
2 0 obj
@@ -20642,7 +20642,7 @@ endobj
endobj
143 0 obj
<< /Border [0 0 0]
-/Dest (_rgant_aaa_main)
+/Dest (_rgant-aaa_main)
/Subtype /Link
/Rect [48.24 664.68 78.333 678.96]
/Type /Annot
@@ -209458,7 +209458,7 @@ endobj
endobj
1221 0 obj
<< /Border [0 0 0]
-/Dest (_rgant_aaa_deprecated)
+/Dest (_rgant-aaa_deprecated)
/Subtype /Link
/Rect [198.58934615384612 716.4899999999999 258.51911538461536 730.77]
/Type /Annot
@@ -209466,7 +209466,7 @@ endobj
endobj
1222 0 obj
<< /Border [0 0 0]
-/Dest (_rgant_aaa_deprecated)
+/Dest (_rgant-aaa_deprecated)
/Subtype /Link
/Rect [258.51911538461536 718.0859999999999 290.01911538461536 728.5859999999999]
/Type /Annot
[4/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.html b/content/guides/rgsvc.html
index 755fc3a..af35fdb 100644
--- a/content/guides/rgsvc.html
+++ b/content/guides/rgsvc.html
@@ -587,7 +587,8 @@ for Apache Isis and contribute back to the project)</p>
<div class="paragraph">
<p>The domain services also group into various broad categories. Many support functionality of the various layers of the
system (presentation layer, application layer, core domain, persistence layer); others exist to allow the domain objects
-to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling). The diagram below shows these categories:</p>
+to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling). The diagram
+below shows these categories:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -596,27 +597,38 @@ to integrate with other bounded contexts, or provide various metadata (eg for de
</div>
<div class="paragraph">
<p>A small number of domain services can be considered both API and SPI; a good example is the <a href="#_rgsvc_api_EmailService"><code>EmailService</code></a> that is of direct use for domain objects wishing to send out emails,
-but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a> functionality supported by the <a href="ugvw.html">Wicket viewer</a>. The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p>
+but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a>
+functionality supported by the <a href="ugvw.html">Wicket viewer</a>. The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events,
+but is also used by the framework to automatically emit events for
+<a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p>
</div>
<div class="paragraph">
-<p>For these hybrid services we have categorized the service as an "API" service. This chapter therefore contains only the strictly SPI services.</p>
+<p>For these hybrid services we have categorized the service as an "API" service. This chapter therefore contains only
+the strictly SPI services.</p>
</div>
<div class="paragraph">
-<p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain service.</p>
+<p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain
+service.</p>
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_intro_public-api">2.2. Public API</h3>
+<h3 id="_rgsvc_intro_public-api">2.2. Public API vs Internal Services</h3>
<div class="paragraph">
<p>The vast majority of Apache Isis' domain services are defined in Apache Isis' applib (<code>o.a.i.core:isis-core-applib</code>
module) as stable, public classes. Importantly, this also minimizes the coupling between your code and Apache Isis,
allowing you to easily mock out these services in your unit tests.</p>
</div>
+<div class="paragraph">
+<p>The framework also defines a number of "internal" services. These are not part of the framework’s formal API, in that
+they use classes that are outside of the applib. These are documented here, but should be thought of as part of the
+internal design of the framework, and are liable to change from release to release.</p>
+</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_intro_using-the-services">2.3. Using the services</h3>
<div class="paragraph">
-<p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service as an annotated field and Apache Isis will inject the service into your object.</p>
+<p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service
+as an annotated field and Apache Isis will inject the service into your object.</p>
</div>
<div class="paragraph">
<p>For example:</p>
@@ -665,10 +677,12 @@ JDO/DataNucleus.</p>
<div class="sect2">
<h3 id="_rgsvc_intro_overriding-the-services">2.4. Overriding the services</h3>
<div class="paragraph">
-<p>The framework provides default implementations for many of the domain services. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
+<p>The framework provides default implementations for many of the domain services. This is convenient, but sometimes you
+will want to replace the default implementation with your own service implementation.</p>
</div>
<div class="paragraph">
-<p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
+<p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>
+attribute, specifying a low number (typically <code>"1"</code>).</p>
</div>
<div class="admonitionblock note">
<table>
@@ -678,7 +692,10 @@ JDO/DataNucleus.</p>
</td>
<td class="content">
<div class="paragraph">
-<p>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern), not just the first one. The services in question are: <a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>, <a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and
+<p>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern),
+not just the first one. The services in question are:
+<a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>,
+<a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and
<a href="#_rgsvc_spi_RoutingService"><code>RoutingService</code></a>.</p>
</div>
</td>
@@ -686,7 +703,8 @@ JDO/DataNucleus.</p>
</table>
</div>
<div class="paragraph">
-<p>For example, suppose you wanted to provide your own implementation of <a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
+<p>For example, suppose you wanted to provide your own implementation of
+<a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -713,7 +731,9 @@ JDO/DataNucleus.</p>
</table>
</div>
<div class="paragraph">
-<p>It’s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the default); this is also possible and quite easy (if using <code>1.10.0</code> or later). The idea is to have the framework inject all implementations of the service, and then to delegate to the first one that isn’t "this" one:</p>
+<p>It’s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the
+default); this is also possible and quite easy (if using <code>1.10.0</code> or later). The idea is to have the framework
+inject all implementations of the service, and then to delegate to the first one that isn’t "this" one:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -758,6 +778,114 @@ JDO/DataNucleus.</p>
<p>The above code could be improved by caching the delegateLocaleProvider once located (rather than searching each time).</p>
</div>
</div>
+<div class="sect2">
+<h3 id="_rgsvc_intro_commands-and-events">2.5. Command and Events (<code>1.13.0-SNAPSHOT</code>)</h3>
+<div class="paragraph">
+<p>A good number of the domain services manage the execution of action invocations/property edits, along with the state
+of domain objects that are modified as a result of these. These services capture information which can then be used
+for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the
+execution be performed in the background at some later date.</p>
+</div>
+<div class="paragraph">
+<p>The diagram below shows how these services fit together. The outline boxes are services while the coloured boxes
+represent data structures - defined in the applib and therefore accessible to domain applications - which hold various
+information about the executions.</p>
+</div>
+<div class="imageblock">
+<div class="content">
+<a class="image" href="images/reference-services/commands-and-events.png"><img src="images/reference-services/commands-and-events.png" alt="commands and events" width="960px"></a>
+</div>
+</div>
+<div class="paragraph">
+<p>To explain:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the (request-scoped) <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> captures the user’s intention to
+invoke an action or edit a property; this is held by the <code>Command</code> object.</p>
+</li>
+<li>
+<p>if a <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> has been configured, then this will be used to
+create the <code>Command</code> object implementation, generally so that it can then also be persisted.<br></p>
+<div class="paragraph">
+<p>If the action or property is annotated to be invoked in the background (using
+<a href="rgant.html#_rgant-Action_command"><code>@Action#command…​()</code></a> or
+<a href="rgant.html#_rgant-Property_command"><code>@Property#command…​()</code></a>) then no further work is done. But,
+if the action/property is to be executed in the foreground, then the interaction continues.</p>
+</div>
+</li>
+<li>
+<p>the (request-scoped) <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service acts as a
+factory for the <code>Interaction</code> object, which keeps track of the call-graph of executions (<code>Interaction.Execution</code>)
+of either action invocations or property edits. In the majority of cases there is likely to be just a single top-level
+node of this graph, but for applications that use the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>
+extensively each successive call results in a new child execution.</p>
+</li>
+<li>
+<p>before and after each action invocation/property edit, a <a href="rgcms.html#_rgcms_classes_domainevent">domain event</a> is
+may be broadcast to all subscribers. Whether this occurs depends on whether the action/property has been annotated
+(using <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> or
+<a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>).<br></p>
+<div class="paragraph">
+<p>(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).</p>
+</div>
+</li>
+<li>
+<p>As each execution progresses, and objects that are modified are "enlisted" into the (internal)
+<a href="#_rgsvc_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service. Metrics as
+to which objects are merely loaded into memory are also captured using the
+<a href="#_rgsvc_api_MetricsService"><code>MetricsService</code></a> (not shown on the diagram).</p>
+</li>
+<li>
+<p>At the end of each execution, details of that execution are published through the (internal)
+<a href="#_rgsvc_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> domain service. This is only done for
+actions/properties annotated appropriate (with <a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> or
+<a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a>). <br></p>
+<div class="paragraph">
+<p>The internal service delegates in turn to any registered
+<a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> (deprecated) and also to any
+registered <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>s (there may be more than one).</p>
+</div>
+</li>
+<li>
+<p>At the end of all executions, details of all changed objects are published, again through the (internal)
+<a href="#_rgsvc_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> to any registered <code>PublishingService</code>
+or <code>PublisherService</code> implementations. Only domain objects specified to be published with
+<a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> are published.</p>
+</li>
+<li>
+<p>Also at the end of all executions, details of all changed properties are passed to any registered
+<a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> by way of the (internal)
+<a href="#_rgsvc_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> domain service.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Implementations of <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> can use the <code>Command#getMemento()</code>
+method to obtain a XML equivalent of that <code>Command</code>, reified using the <a href="rgcms.html#_rgcms_schema-cmd"><code>cmd.xsd</code></a>
+schema. This can be converted back into a <code>CommandDto</code> using the <code>CommandDtoUtils</code> utility class (part of the applib).</p>
+</div>
+<div class="paragraph">
+<p>Similarly, implementations of <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> can use the
+<code>InteractionDtoUtils</code> utility class to obtain a <code>InteractionDto</code> representing the interaction, either just for a single
+execution or for the entire call-graph. This can be converted into XML in a similar fashion.</p>
+</div>
+<div class="paragraph">
+<p>Likewise, the <code>PublishedObjects</code> class passed to the <code>PublisherService</code> at the end of the interaction provides the
+<code>PublishedObjects#getDto()</code> method which returns a <code>ChangesDto</code> instance. This can be converted into XML using the
+<code>ChangesDtoUtils</code> utility class.</p>
+</div>
+<div class="paragraph">
+<p>One final point: multiple <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> implementations are supported
+because different implementations may have different responsibilities. For example, the (non-ASF)
+<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module is responsible for publishing
+messages onto an ActiveMQ event bus, for inter-system communication. However, the SPI can also be used for profiling;
+each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that
+execution, and thus could be used for application profiling. The framework provides a default
+<code>PublisherServiceLogging</code> implementation that logs this using SLF4J.</p>
+</div>
+</div>
</div>
</div>
<div class="sect1">
@@ -1002,7 +1130,7 @@ by the HTTP <code>Accept</code> header.</p>
<p>Unlike most other domain services, the framework (that is, <code>ContentNegotiationService</code>) will check <em>all</em> available
implementations of <code>ContentMappingService</code> to convert the domain object to the requested media type, rather than merely
the first implementation found; in other words it uses the chain-of-responsibility pattern. Services are checked
-in the ordering defined by <a href="rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).
+in the ordering defined by <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).
The mapped object used will be the first non-<code>null</code> result returned by an implementation.</p>
</div>
</td>
@@ -1549,7 +1677,7 @@ metadata available.</p>
<p>Unlike most other domain services, the framework will check <em>all</em> available implementations of <code>GridSystemService</code> to
obtain available grid systems, rather than merely the first implementation found; in other words it uses the
chain-of-responsibility pattern. Services are called in the order defined by
-<a href="rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).</p>
+<a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).</p>
</div>
<div class="paragraph">
<p>Note though that each concrete implementation must also provide corresponding Wicket viewer components capable of
@@ -1582,7 +1710,7 @@ interpreting the grid layout.</p>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
<td>The concrete subclass of <code>Grid</code> supported by this implementation. As noted in the introduction, there can be multiple implementations of this service, but there can only be one implementation per concrete subclass. As is normal practice,
-the service with the lowest <a href="rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> takes precedence.</td>
+the service with the lowest <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> takes precedence.</td>
</tr>
<tr>
<td><i class="conum" data-value="2"></i><b>2</b></td>
@@ -1598,16 +1726,16 @@ the service with the lowest <a href="rgant.html#_rgant_DomainServiceLayout_menuO
</tr>
<tr>
<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>Validates and normalizes a grid, modifying the grid so that all of the domain object’s members (properties, collections, actions) are bound to regions of the grid. This is done using existing metadata, most notably that of the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the
+<td>Validates and normalizes a grid, modifying the grid so that all of the domain object’s members (properties, collections, actions) are bound to regions of the grid. This is done using existing metadata, most notably that of the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the
<code>@MemberOrder</code> annotation to be removed from the source code of the domain class (but other annotations must be retained).</td>
</tr>
<tr>
<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>Takes a normalized grid and enriches it with additional metadata (taken from Apache Isis' internal metadata) that can be represented in the layout XML. Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations (<a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>) to be removed from the source code of the domain class.</td>
+<td>Takes a normalized grid and enriches it with additional metadata (taken from Apache Isis' internal metadata) that can be represented in the layout XML. Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations (<a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>) to be removed from the source code of the domain class.</td>
</tr>
<tr>
<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>Takes a normalized grid and strips out removes all members, leaving only the grid structure. Such a grid, if persisted as the layout XML file for the domain class, requires that the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation is retained in the source code of said class in order to bind members to the regions of the grid.</td>
+<td>Takes a normalized grid and strips out removes all members, leaving only the grid structure. Such a grid, if persisted as the layout XML file for the domain class, requires that the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation is retained in the source code of said class in order to bind members to the regions of the grid.</td>
</tr>
</table>
</div>
@@ -1775,15 +1903,15 @@ Isis' internal metamodel, in other words to ensure that all of the domain object
</tr>
<tr>
<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>validates and normalizes a grid, modifying the grid so that all of the domain object’s members (properties, collections, actions) are bound to regions of the grid. This is done using existing metadata, most notably that of the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the <code>@MemberOrder</code> annotation to be removed from the source code of the domain class (but other annotations must be retained).</td>
+<td>validates and normalizes a grid, modifying the grid so that all of the domain object’s members (properties, collections, actions) are bound to regions of the grid. This is done using existing metadata, most notably that of the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the <code>@MemberOrder</code> annotation to be removed from the source code of the domain class (but other annotations must be retained).</td>
</tr>
<tr>
<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>Takes a normalized grid and enriches it with additional metadata (taken from Apache Isis' internal metadata) that can be represented in the layout XML. Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations (<a href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>) to be removed from the source code of the domain class.</td>
+<td>Takes a normalized grid and enriches it with additional metadata (taken from Apache Isis' internal metadata) that can be represented in the layout XML. Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations (<a href="rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a> and <a href="rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>) to be removed from the source code of the domain class.</td>
</tr>
<tr>
<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>Takes a normalized grid and strips out removes all members, leaving only the grid structure. Such a grid, if persisted as the layout XML file for the domain class, requires that the <a href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation is retained in the source code of said class in order to bind members to the regions of the grid.</td>
+<td>Takes a normalized grid and strips out removes all members, leaving only the grid structure. Such a grid, if persisted as the layout XML file for the domain class, requires that the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotation is retained in the source code of said class in order to bind members to the regions of the grid.</td>
</tr>
</table>
</div>
@@ -2008,7 +2136,7 @@ of the implementation to figure out what the "owning" object might be.</p>
<li>
<p>if an action returns <code>null</code> or is <code>void</code>, then return some other "useful" object.<br></p>
<div class="paragraph">
-<p>For example, return the home page (eg as defined by the <a href="rgant.html#_rgant_HomePage"><code>@HomePage</code></a> annotation).</p>
+<p>For example, return the home page (eg as defined by the <a href="rgant.html#_rgant-HomePage"><code>@HomePage</code></a> annotation).</p>
</div>
</li>
</ul>
@@ -2027,7 +2155,7 @@ of the implementation to figure out what the "owning" object might be.</p>
<p>Unlike most other domain services, the framework will check <em>all</em> available implementations of
<code>RoutingService</code> to return a route, rather than the first implementation found; in other words it uses the
chain-of-responsibility pattern. Services are called in the order defined by
-<a href="rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>). The route used will be the
+<a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>). The route used will be the
result of the first implementation checked that declares that it can provide a route.</p>
</div>
</td>
@@ -2070,7 +2198,7 @@ if a <code>null</code> or <code>void</code> was provided. It uses the <a href="
</div>
<div class="paragraph">
<p>There can be multiple implementations of <code>RoutingService</code> registered. These are checked in turn (chain of responsibility
-pattern), ordered according to <a href="rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>
+pattern), ordered according to <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>
(as explained in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).
The route from the first service that returns <code>true</code> from its <code>canRoute(…​)</code> method will be used.</p>
</div>
@@ -2421,7 +2549,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<h2 id="_rgsvc_presentation-layer-internal-spi">4. Presentation Layer internal SPI</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave. In addition to those defined in the applib, the framework also defines a small number of services that use classes that are internal to the framework.</p>
+<p>These domain services are internal to the framework, controlling various aspects of the presentation layer.</p>
</div>
<div class="admonitionblock warning">
<table>
@@ -2431,14 +2559,16 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</td>
<td class="content">
<div class="paragraph">
-<p>We do not guarantee that <a href="http://semver.org">semantic versioning</a> will be honoured for these ASPIs.</p>
+<p>We do not guarantee that <a href="http://semver.org">semantic versioning</a> will be honoured for these SPIs.</p>
</div>
</td>
</tr>
</table>
</div>
<div class="paragraph">
-<p>The table below summarizes the presentation layer non-public SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
+<p>The table below summarizes the presentation layer internal SPIs defined by Apache Isis. It also lists their
+corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
+(non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">Table 2. "Internal" SPI Services</caption>
@@ -2997,14 +3127,28 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<code>services.command</code><br>
<code>CommandContext</code></a></p></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Request-scoped access the current action that is being invoked, represented as a command object</p>
+<p>Request-scoped access to capture the users’s <em>intention</em> to invoke an action or to edit a property.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandContext</code><br>
<code>o.a.i.core</code><br>
<code>isis-core-applib</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">API is also a concrete class.<br>
depends on:<br>
-<a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> for persistent <code>Command</code>, else in-memory impl. used</p></td>
+<a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> for persistent <code>Command</code>, else in-memory impl. used.
+</p><p class="tableblock">The <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> manages the actual execution of the command.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_InteractionContext"><code>o.a.i.applib.</code><br>
+<code>services.iactn</code><br>
+<code>InteractionContext</code></a></p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>(<code>1.13.0-SNAPSHOT</code>) Request-scoped access to the current member execution (action invocation or property edit),
+represented as the <code>Interaction</code> context.</p>
+</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>InteractionContext</code><br>
+<code>o.a.i.core</code><br>
+<code>isis-core-applib</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">API is also a concrete class.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_MessageService"><code>o.a.i.applib.</code><br>
@@ -3167,7 +3311,7 @@ compatibility of existing clients. The <code>AcceptHeaderService</code> allows
</div>
</div>
<div class="paragraph">
-<p>The REST request is submitted to a domain service with a <a href="rgant.html#_rgant_DomainService_nature">nature</a> of <code>VIEW_REST_ONLY</code> (<code>MyRestApi</code> in the diagram). This uses the <code>AcceptHeaderService</code> to obtain the values of the
+<p>The REST request is submitted to a domain service with a <a href="rgant.html#_rgant-DomainService_nature">nature</a> of <code>VIEW_REST_ONLY</code> (<code>MyRestApi</code> in the diagram). This uses the <code>AcceptHeaderService</code> to obtain the values of the
HTTP <code>Accept</code> header. Based on this it delegates to the appropriate underlying domain service (with a nature of
<code>DOMAIN</code> so that they are not exposed in the REST API at all).</p>
</div>
@@ -3336,33 +3480,58 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_BackgroundService">5.3. <code>BackgroundService</code></h3>
+<h3 id="_rgsvc_api_BackgroundService">5.3. <code>BackgroundService2</code></h3>
+<div class="paragraph">
+<p>The <code>BackgroundService2</code> domain service, and also the companion
+<a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService2</code></a> SPI service, enable commands
+to be persisted such that they may be invoked in the background. (The <code>BackgroundService2</code> and
+<code>BackgroundCommandService2</code> extensions to these services introduced in <code>1.13.0-SNAPSHOT</code>).</p>
+</div>
<div class="paragraph">
-<p>The <code>BackgroundService</code>, and the companion <a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a> SPI service (used by Apache Isis itself), enable action invocations to be persisted such that they may be invoked in the background.</p>
+<p>The <code>BackgroundService2</code> is responsible for capturing a memento representing the command in a typesafe way,
+and persisting it rather than executing it directly.</p>
</div>
<div class="paragraph">
-<p>The <code>BackgroundService</code> is responsible for capturing a memento representing the action invocation in a typesafe way, and persisting it rather than executing it directly.</p>
+<p>The default <code>BackgroundServiceDefault</code> implementation works by using a proxy wrapper around the target so that it can
+capture the action to invoke and its arguments. (As of <code>1.13.0-SNAPSHOT</code>), this is done using <a href="#_rgsvc_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a> (in previous releases it used (a private copy of) <a href="#_rgsvc_api_MementoService"><code>MementoService</code></a>).</p>
</div>
<div class="paragraph">
-<p>The default <code>BackgroundServiceDefault</code> implementation (provided by isis-core) works by using a proxy wrapper around the target so that it can capture the action to invoke and its arguments using (a private copy of) <a href="#_rgsvc_api_MementoService"><code>MementoService</code></a>. The persistence delegates the persistence of the memento to an appropriate implementation of the companion <code>BackgroundCommandService</code>. One such implementation of <code>BackgroundCommandService</code> is provided by (non-ASF) <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> module.</p>
+<p>The persistence delegates the persistence of the memento to an appropriate implementation of the companion
+<code>BackgroundCommandService2</code>. One such implementation of <code>BackgroundCommandService</code> is provided by (non-ASF)
+<a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> module.</p>
</div>
<div class="paragraph">
-<p>The persisting of commands is only half the story; there needs to be a separate process to read the commands and execute them. The <code>BackgroundCommandExecution</code> abstract class (discussed <a href="#_rgsvc_api_BackgroundService_BackgroundCommandExecution">below</a>) provides infrastructure to do this; the concrete
-implementation of this class depends on the configured <code>BackgroundCommandService</code> (in order to query for the persisted (background) <code>Command</code>s.</p>
+<p>The persisting of commands is only half the story; there needs to be a separate process to read the commands and
+execute them. The <code>BackgroundCommandExecution</code> abstract class (discussed
+<a href="#_rgsvc_api_BackgroundService_BackgroundCommandExecution">below</a>) provides infrastructure to do this;
+the concrete implementation of this class depends on the configured <code>BackgroundCommandService</code> (in order to query for
+the persisted (background) <code>Command</code>s.</p>
</div>
<div class="sect3">
<h4 id="_api_implementation_3">5.3.1. API & Implementation</h4>
<div class="paragraph">
-<p>Returns a proxy around the object which is then used to obtain the signature of the action to be invoked in the background.</p>
+<p>The API is:</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">BackgroundService</span> {
- <span class="annotation">@Programmatic</span>
- <T> T execute(<span class="directive">final</span> T object);
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">BackgroundService2</span> {
+ <T> T execute(<span class="directive">final</span> T object); <i class="conum" data-value="1"></i><b>(1)</b>
+ <T> T executeMixin(<span class="predefined-type">Class</span><T> mixinClass, <span class="predefined-type">Object</span> mixedIn); <i class="conum" data-value="2"></i><b>(2)</b>
}</code></pre>
</div>
</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>returns a proxy around the domain object; any methods executed against this proxy will result in a command (to invoke the corresponding action) being persisted by <a href="#_rgsvc_spi_BackgroundCommandService2"><code>BackgroundCommandService2</code></a></td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>(<code>1.13.0-SNAPSHOT</code>) returns a proxy around the mixin; any methods executed against this proxy will result in a command (to invoke the corresponding mixin action) being persisted by <a href="#_rgsvc_spi_BackgroundCommandService2"><code>BackgroundCommandService2</code></a>.</td>
+</tr>
+</table>
+</div>
<div class="paragraph">
<p>The default implementation is provided by core (<code>o.a.i.core.runtime.services.background.BackgroundServiceDefault</code>).</p>
</div>
@@ -3381,7 +3550,7 @@ implementation of this class depends on the configured <code>BackgroundCommandSe
<span class="keyword">for</span>(Customer customer: customerRepository.findCustomersToInvoice()) {
backgroundService.execute(customer).submitInvoice();
}
- container.informUser(<span class="string"><span class="delimiter">"</span><span class="content">Calculating...</span><span class="delimiter">"</span></span>);
+ messageService.informUser(<span class="string"><span class="delimiter">"</span><span class="content">Calculating...</span><span class="delimiter">"</span></span>);
}</code></pre>
</div>
</div>
@@ -3475,6 +3644,10 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<div class="paragraph">
<p>The implementations of <code>CommandService</code> and <code>BackgroundCommandService</code> go together; typically both parent <code>Command`s and child background `Command`s will be persisted in the same way. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> module provides implementations of both (see <a href="#_rgsvc_spi_CommandService">`CommandService</code></a> and <a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>).</p>
</div>
+<div class="paragraph">
+<p>The <a href="#_rgsvc_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a> (<code>1.13.0-SNAPSHOT</code>) is used to obtain
+a memento of the command such that it can be persisted. (In earlier versions, <a href="#_rgsvc_api_MementoService"><code>MementoService</code></a> was used for this purpose).</p>
+</div>
</div>
<div class="sect3">
<h4 id="_rgsvc_api_BackgroundService_BackgroundCommandExecution">5.3.6. <code>BackgroundCommandExecution</code> abstract class</h4>
@@ -3754,6 +3927,9 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<span class="directive">public</span> Bookmark getResult(); <i class="conum" data-value="16"></i><b>(16)</b>
<span class="directive">public</span> <span class="predefined-type">String</span> getException(); <i class="conum" data-value="17"></i><b>(17)</b>
+
+ <span class="annotation">@Deprecated</span>
+ <span class="type">int</span> next(<span class="directive">final</span> <span class="predefined-type">String</span> sequenceAbbr); <i class="conum" data-value="18"></i><b>(18)</b>
}</code></pre>
</div>
</div>
@@ -3827,6 +4003,11 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<td><i class="conum" data-value="17"></i><b>17</b></td>
<td><code>getException()</code> - exception stack trace if action threw exception</td>
</tr>
+<tr>
+<td><i class="conum" data-value="18"></i><b>18</b></td>
+<td>(as of <code>1.13.0-SNAPSHOT</code>) no longer used by the framework; see instead
+<a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> and <code>Interaction#next()</code>.</td>
+</tr>
</table>
</div>
</div>
@@ -3960,7 +4141,22 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_MessageService">5.5. <code>MessageService</code></h3>
+<h3 id="_rgsvc_api_InteractionContext">5.5. <code>InteractionContext</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgsvc_api_MessageService">5.6. <code>MessageService</code></h3>
<div class="paragraph">
<p>The <code>MessageService</code> allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated.</p>
</div>
@@ -3979,7 +4175,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_and_usage">5.5.1. API and Usage</h4>
+<h4 id="_api_and_usage">5.6.1. API and Usage</h4>
<div class="paragraph">
<p>The API of <code>MessageService</code> is:</p>
</div>
@@ -4043,13 +4239,13 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_16">5.5.2. Implementation</h4>
+<h4 id="_implementation_16">5.6.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.message.MessageServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_6">5.5.3. Registering the Service</h4>
+<h4 id="_registering_the_service_6">5.6.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -4064,14 +4260,14 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_SessionManagementService">5.6. <code>SessionManagementService</code></h3>
+<h3 id="_rgsvc_api_SessionManagementService">5.7. <code>SessionManagementService</code></h3>
<div class="paragraph">
<p>The <code>SessionManagementService</code> provides the ability to programmatically manage sessions. The primary use case is
for fixture scripts or other routines that are invoked from the UI and which create or modify large amounts of data.
A classic example is migrating data from one system to another.</p>
</div>
<div class="sect3">
-<h4 id="_api">5.6.1. API</h4>
+<h4 id="_api">5.7.1. API</h4>
<div class="paragraph">
<p>The API of <code>SessionManagementService</code> is:</p>
</div>
@@ -4107,13 +4303,13 @@ session and start a new transaction.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_17">5.6.2. Implementation</h4>
+<h4 id="_implementation_17">5.7.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.xactn.SessionManagementServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_7">5.6.3. Registering the Service</h4>
+<h4 id="_registering_the_service_7">5.7.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -4128,7 +4324,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_TitleService">5.7. <code>TitleService</code></h3>
+<h3 id="_rgsvc_api_TitleService">5.8. <code>TitleService</code></h3>
<div class="paragraph">
<p>The <code>TitleService</code> provides methods to programmatically obtain the title and icon of a domain object.</p>
</div>
@@ -4147,7 +4343,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_2">5.7.1. API</h4>
+<h4 id="_api_2">5.8.1. API</h4>
<div class="paragraph">
<p>The API of <code>TitleService</code> is:</p>
</div>
@@ -4173,7 +4369,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_usage_6">5.7.2. Usage</h4>
+<h4 id="_usage_6">5.8.2. Usage</h4>
<div class="paragraph">
<p>By way of example, here’s some code based on a system for managing government benefits:</p>
</div>
@@ -4198,13 +4394,13 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_18">5.7.3. Implementation</h4>
+<h4 id="_implementation_18">5.8.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.title.TitleServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_8">5.7.4. Registering the Service</h4>
+<h4 id="_registering_the_service_8">5.8.4. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -4219,7 +4415,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_TransactionService">5.8. <code>TransactionService</code></h3>
+<h3 id="_rgsvc_api_TransactionService">5.9. <code>TransactionService</code></h3>
<div class="paragraph">
<p>The <code>TransactionService</code> provides a small number of methods to allow domain objects to influence user transactions.</p>
</div>
@@ -4238,7 +4434,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_3">5.8.1. API</h4>
+<h4 id="_api_3">5.9.1. API</h4>
<div class="paragraph">
<p>The API of <code>TransactionService</code> is:</p>
</div>
@@ -4277,13 +4473,13 @@ end of the transaction, or immediately prior to the next query.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_19">5.8.2. Implementation</h4>
+<h4 id="_implementation_19">5.9.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.xactn.TransactionServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_9">5.8.3. Registering the Service</h4>
+<h4 id="_registering_the_service_9">5.9.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -4298,7 +4494,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_WrapperFactory">5.9. <code>WrapperFactory</code></h3>
+<h3 id="_rgsvc_api_WrapperFactory">5.10. <code>WrapperFactory</code></h3>
<div class="paragraph">
<p>The <code>WrapperFactory</code> provides the ability to enforce business rules for programmatic interactions between domain objects. If there is a (lack-of-) trust boundary between the caller and callee — eg if they reside in different modules — then the wrapper factory is a useful mechanism to ensure that any business constraints defined by te callee are honoured.</p>
</div>
@@ -4326,7 +4522,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<p>This capability is frequently used within <a href="ugtst.html#_ugtst_integ-test-support">integration tests</a>, but can also be used in production code. (There are analogies that can be drawn here with the way that JEE beans can interact through an EJB local interface).</p>
</div>
<div class="sect3">
-<h4 id="_api_4">5.9.1. API</h4>
+<h4 id="_api_4">5.10.1. API</h4>
<div class="paragraph">
<p>The API provided by the service is:</p>
</div>
@@ -4435,7 +4631,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_usage_7">5.9.2. Usage</h4>
+<h4 id="_usage_7">5.10.2. Usage</h4>
<div class="paragraph">
<p>The caller will typically obtain the target object (eg from some repository) and then use the injected <code>WrapperFactory</code> to wrap it before interacting with it.</p>
</div>
@@ -4494,7 +4690,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_listener_api">5.9.3. Listener API</h4>
+<h4 id="_listener_api">5.10.3. Listener API</h4>
<div class="paragraph">
<p>The <code>WrapperFactory</code> also provides a listener API to allow other services to listen in on interactions.</p>
</div>
@@ -4538,7 +4734,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_10">5.9.4. Registering the Service</h4>
+<h4 id="_registering_the_service_10">5.10.4. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -4806,15 +5002,22 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
<div class="sect2">
<h3 id="_rgsvc_spi_CommandService">6.2. <code>CommandService</code></h3>
<div class="paragraph">
-<p>The <code>CommandService</code> service supports the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service such that <code>Command</code> objects (that reify the invocation of an action on a domain object into an object) can be persisted.</p>
+<p>The <code>CommandService</code> service supports the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service such
+that <code>Command</code> objects (that reify the invocation of an action/edit of a property on a domain object) can be persisted.</p>
</div>
<div class="paragraph">
-<p>Persistent `Command`s support several use cases:</p>
+<p>Persistent <code>Command</code>s support several use cases:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p>they enable profiling of the running application (which actions are invoked then most often, what is their response time)</p>
+<p>they enable profiling of the running application (which actions are invoked then most often, what is their response
+time) ++</p>
+<div class="paragraph">
+<p>However, note that (as of <code>1.13.0-SNAPSHOT</code>) much more powerful profiling capabilities are provided by
+<a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>; these can be logged using the
+<a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</p>
+</div>
</li>
<li>
<p>they act as a parent to any background commands that might be invoked through the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a></p>
@@ -4830,8 +5033,10 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
</li>
</ul>
</div>
+<div class="sect3">
+<h4 id="_screencast">6.2.1. Screencast</h4>
<div class="paragraph">
-<p>This <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> below provides a run-through of the command (profiling) service, auditing service, publishing service. It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
+<p>The <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> below provides a run-through of the command (profiling) service, auditing service, publishing service. It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -4847,31 +5052,51 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
</tr>
</table>
</div>
+</div>
<div class="sect3">
-<h4 id="_spi_18">6.2.1. SPI</h4>
+<h4 id="_spi_18">6.2.2. SPI</h4>
<div class="paragraph">
<p>The <code>CommandService</code> service defines the following very simple API:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">CommandService</span> {
- <span class="annotation">@Programmatic</span>
- Command create();
- <span class="annotation">@Programmatic</span>
- <span class="type">void</span> startTransaction(Command command, <span class="directive">final</span> <span class="predefined-type">UUID</span> transactionId);
- <span class="annotation">@Programmatic</span>
- <span class="type">void</span> complete(Command command);
- <span class="annotation">@Programmatic</span>
- <span class="type">boolean</span> persistIfPossible(Command command);
+ Command create(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="annotation">@Deprecated</span>
+ <span class="type">void</span> startTransaction(Command command, <span class="predefined-type">UUID</span> transactionId); <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="type">boolean</span> persistIfPossible(Command command); <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="type">void</span> complete(Command command); <i class="conum" data-value="4"></i><b>(4)</b>
}</code></pre>
</div>
</div>
-<div class="paragraph">
-<p>where <code>Command</code> is defined as defined by the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service.</p>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Instantiate the appropriate instance of the <code>Command</code> (as defined by the
+<a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service). Its members will be populated automatically by
+the framework.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>(as of <code>1.13.0-SNAPSHOT</code>) is deprecated: the framework automatically populates the <code>Command</code>'s <code>timestamp</code>,
+<code>user</code> and <code>transactionId</code> fields, so there is no need for the service implementation to initialize any of these. In
+particular, the <code>Command</code> will already have been initialized with the provided <code>transactionId</code> argument.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Set the hint that the <code>Command</code> should be persisted if possible (when completed, see below).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>"Complete" the command, typically meaning that the command should be persisted it if its <code>Command#getPersistence()</code>
+flag and persistence hint (<code>Command#isPersistHint()</code>) indicate that it should be. <br></td>
+</tr>
+</table>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_21">6.2.2. Implementation</h4>
+<h4 id="_implementation_21">6.2.3. Implementation</h4>
<div class="paragraph">
<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> module provides an implementation (<code>org.isisaddons.module.command.dom.CommandServiceJdo</code>) that persists <code>Command</code>s using the JDO/DataNucleus object store. It further provides a number of supporting services:</p>
</div>
@@ -4887,13 +5112,13 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
</div>
</div>
<div class="sect3">
-<h4 id="_usage_9">6.2.3. Usage</h4>
+<h4 id="_usage_9">6.2.4. Usage</h4>
<div class="paragraph">
<p>The typical way to indicate that an action should be reified into a <code>Command</code> is by annotating the action using <a href="rgant.html#_rgant-Action_command"><code>@Action#command()</code></a>.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_services_14">6.2.4. Registering the Services</h4>
+<h4 id="_registering_the_services_14">6.2.5. Registering the Services</h4>
<div class="paragraph">
<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> module provides an implementation
of this service (<code>CommandService</code>), and also provides a number of related domain services
@@ -4911,7 +5136,7 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_16">6.2.5. Related Services</h4>
+<h4 id="_related_services_16">6.2.6. Related Services</h4>
<div class="paragraph">
<p>As discussed above, this service supports the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>, providing the ability for <code>Command</code> objects to be
persisted. This is closely related to the <a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>that allows the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a> to schedule commands for background/asynchronous execution.</p>
@@ -4934,7 +5159,7 @@ persisted. This is closely related to the <a href="#_rgsvc_spi_BackgroundCommand
<h3 id="_rgsvc_api_HomePageProviderService">6.3. <code>HomePageProviderService</code></h3>
<div class="paragraph">
<p>This service simply provides access to the home page object (if any) that is returned from the domain service
-action annotated with <a href="rgant.html#_rgant_HomePage"><code>@HomePage</code></a>.</p>
+action annotated with <a href="rgant.html#_rgant-HomePage"><code>@HomePage</code></a>.</p>
</div>
<div class="paragraph">
<p>It is originally introduced to support the default implementation of
@@ -4972,7 +5197,165 @@ configuration is required.</p>
</div>
</div>
<div class="sect1">
-<h2 id="_rgsvc_core-domain-api">7. Core/Domain API</h2>
+<h2 id="_rgsvc_application-layer-internal-spi">7. Application Layer internal SPI</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>These domain services are internal to the framework, controlling various aspects of the application layer.</p>
+</div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>We do not guarantee that <a href="http://semver.org">semantic versioning</a> will be honoured for these SPIs.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The table below summarizes the application layer internal SPIs defined by Apache Isis. It also lists their
+corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
+(non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
+</div>
+<table class="tableblock frame-all grid-all spread">
+<caption class="title">Table 5. "Internal" SPI Services</caption>
+<colgroup>
+<col style="width: 30%;">
+<col style="width: 30%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">SPI</th>
+<th class="tableblock halign-left valign-top">Maven Module<br>
+Impl’n (g: a:)</th>
+<th class="tableblock halign-left valign-top">Implementation</th>
+<th class="tableblock halign-left valign-top">Notes</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_CommandDtoServiceInternal"><code>o.a.i.c.</code><br>
+<code>m.s.command</code><br>
+<code>CommandDtoServiceInternal</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">(<code>1.13.0-SNAPSHOT</code>) Creates memento of current action invocation, for use either as a reified command or for implementations of the <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br>
+<code>InternalServiceDefault</code><br>
+<code>o.a.i.c.r.s.command</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>Key:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p>
+</li>
+<li>
+<p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p>
+</li>
+</ul>
+</div>
+<div class="sect2">
+<h3 id="_rgsvc_spi_CommandDtoServiceInternal">7.1. <code>CommandDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
+<div class="paragraph">
+<p>The <code>CommandDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>) is responsible for creating an memento of the current action
+invocation or property edit, to store in the <code>Command</code> object (from
+<a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>). This memento is a JAXB DTO being an instance of the
+<a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a>, so can be reified so that its execution can be deferred until later,
+as a <a href="#_rgsvc_spi_BackgroundCommandService">background command</a>.</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_implementation">7.1.1. SPI & Implementation</h4>
+<div class="paragraph">
+<p>The SPI of the service is:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">CommandMementoService</span> {
+ <span class="annotation">@Deprecated</span>
+ ActionInvocationMemento asActionInvocationMemento( <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="predefined-type">Method</span> m,
+ <span class="predefined-type">Object</span> domainObject, <span class="predefined-type">Object</span><span class="type">[]</span> args);
+ CommandDto asCommandDto( <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="predefined-type">List</span><ObjectAdapter> targetAdapters,
+ ObjectAction objectAction,
+ ObjectAdapter<span class="type">[]</span> argAdapters);
+ CommandDto asCommandDto( <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="directive">final</span> <span class="predefined-type">List</span><ObjectAdapter> targetAdapters,
+ <span class="directive">final</span> OneToOneAssociation association,
+ <span class="directive">final</span> ObjectAdapter valueAdapterOrNull);
+ <span class="type">void</span> addActionArgs( <i class="conum" data-value="4"></i><b>(4)</b>
+ <span class="directive">final</span> ObjectAction objectAction,
+ <span class="directive">final</span> ActionDto actionDto,
+ <span class="directive">final</span> ObjectAdapter<span class="type">[]</span> argAdapters);
+ <span class="type">void</span> addPropertyValue( <i class="conum" data-value="5"></i><b>(5)</b>
+ <span class="directive">final</span> OneToOneAssociation property,
+ <span class="directive">final</span> PropertyDto propertyDto,
+ <span class="directive">final</span> ObjectAdapter valueAdapter);
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Note that this method (more precisely, <code>ActionInvocationMemento</code>) does <em>not</em> support mixins.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Returns a JAXB DTO being an instance of the <a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a> (hence convertible to
+XML) that represents the <em>intention</em> to invoke an action on a target object (or possibly many targets, for
+bulk actions). If an action, it can also be either mixin action or a contributed action.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Returns a JAXB DTO that represents the intention to edit (set or clear) a property on a target (or possibly many
+targets, for symmetry with actions).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>add the arguments of an action to an <code>ActionDto</code>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="5"></i><b>5</b></td>
+<td>add the new value argument of a property to a <code>PropertyDto</code>.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The SPI is implemented by <code>o.a.i.c.r.s.command.CommandDtoServiceInternalServiceDefault</code>.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgsvc_spi_InteractionDtoServiceInternal">7.2. <code>InteractionDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_rgsvc_core-domain-api">8. Core/Domain API</h2>
<div class="sectionbody">
<div class="paragraph">
<p>The core/domain APIs provide general-purpose services to the domain objects, for example obtaining the current time or user, or instantiating domain objects.</p>
@@ -4981,7 +5364,7 @@ configuration is required.</p>
<p>The table below summarizes the core/domain APIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
</div>
<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 5. Core/Domain Layer API</caption>
+<caption class="title">Table 6. Core/Domain Layer API</caption>
<colgroup>
<col style="width: 25%;">
<col style="width: 50%;">
@@ -5058,7 +5441,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
</div></div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>EventBusServiceJdo</code><br>
<code>o.a.i.core</code><br>
-<code>isis-core-objectstore-jdo-datanucleus</code></p></td>
+<code>isis-core-runtime</code></p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
@@ -5118,7 +5501,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
<p>There is also a number of deprecated domain services.</p>
</div>
<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 6. Deprecated Domain Services</caption>
+<caption class="title">Table 7. Deprecated Domain Services</caption>
<colgroup>
<col style="width: 25%;">
<col style="width: 25%;">
@@ -5163,7 +5546,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
</ul>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_ClockService">7.1. <code>ClockService</code></h3>
+<h3 id="_rgsvc_api_ClockService">8.1. <code>ClockService</code></h3>
<div class="paragraph">
<p>Most applications deal with dates and times in one way or another. For example, if an <code>Order</code> is placed, then the <code>Customer</code> may have 30 days to pay the <code>Invoice</code>, otherwise a penalty may be levied.</p>
</div>
@@ -5177,7 +5560,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
<p>Therefore it’s common to provide a domain service whose responsibility is to provide the current time. This service can be injected into any domain object (and can be mocked out for unit testing). Apache Isis provides such a facade through the <code>ClockService</code>.</p>
</div>
<div class="sect3">
-<h4 id="_api_implementation_6">7.1.1. API & Implementation</h4>
+<h4 id="_api_implementation_6">8.1.1. API & Implementation</h4>
<div class="paragraph">
<p>The API defined by <code>ClockService</code> is:</p>
</div>
@@ -5203,7 +5586,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
</div>
</div>
<div class="sect3">
-<h4 id="_testing_support">7.1.2. Testing Support</h4>
+<h4 id="_testing_support">8.1.2. Testing Support</h4>
<div class="paragraph">
<p>The default <code>ClockService</code> implementation in fact simply delegates to another class defined in the API, namely the <code>o.a.i.applib.clock.Clock</code>, an abstract singleton class. It is not recommended that your code use the <code>Clock</code> directly, but you should understand how this all works:</p>
</div>
@@ -5277,7 +5660,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_12">7.1.3. Registering the Service</h4>
+<h4 id="_registering_the_service_12">8.1.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -5291,7 +5674,7 @@ instead subclass from <code>o.a.i.applib.clock.Clock</code> singleton (as descri
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_ConfigurationService">7.2. <code>ConfigurationService</code></h3>
+<h3 id="_rgsvc_api_ConfigurationService">8.2. <code>ConfigurationService</code></h3>
<div class="paragraph">
<p>The <code>ConfigurationService</code> allows domain objects to read the configuration properties aggregated from the various <a href="rgcfg.html#_rgcfg_configuration-files">configuration files</a>.</p>
</div>
@@ -5310,7 +5693,7 @@ instead subclass from <code>o.a.i.applib.clock.Clock</code> singleton (as descri
</table>
</div>
<div class="sect3">
-<h4 id="_api_and_usage_2">7.2.1. API and Usage</h4>
+<h4 id="_api_and_usage_2">8.2.1. API and Usage</h4>
<div class="paragraph">
<p>The API of <code>ConfigurationService</code> is:</p>
</div>
@@ -5383,13 +5766,13 @@ instead subclass from <code>o.a.i.applib.clock.Clock</code> singleton (as descri
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_22">7.2.2. Implementation</h4>
+<h4 id="_implementation_22">8.2.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.config.ConfigurationServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_13">7.2.3. Registering the Service</h4>
+<h4 id="_registering_the_service_13">8.2.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -5403,14 +5786,14 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_17">7.2.4. Related services</h4>
+<h4 id="_related_services_17">8.2.4. Related services</h4>
<div class="paragraph">
<p>The <code>ConfigurationServiceMenu</code> exposes the <code>allConfigurationProperties</code> action in the user interface.</p>
</div>
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_DomainObjectContainer">7.3. <code>DomainObjectContainer</code></h3>
+<h3 id="_rgsvc_api_DomainObjectContainer">8.3. <code>DomainObjectContainer</code></h3>
<div class="paragraph">
<p>The <code>DomainObjectContainer</code> service provides a set of general purpose functionality for domain objects to call. Principal amongst these are a generic APIs for querying objects and creating and persisting objects. In addition, the service provides access to security context (the "current user"), allows information and warning messages to be raised, and various other miscellaneous functions.</p>
</div>
@@ -5429,7 +5812,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_apis">7.3.1. APIs</h4>
+<h4 id="_apis">8.3.1. APIs</h4>
<div class="paragraph">
<p>The sections below discuss the functions provided by the service, broken out into categories.</p>
</div>
@@ -6044,13 +6427,13 @@ validation defined by <a href="rgcms.html#_rgcms_methods_reserved_validate"><cod
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_23">7.3.2. Implementation</h4>
+<h4 id="_implementation_23">8.3.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.container.DomainObjectContainerDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_14">7.3.3. Registering the Service</h4>
+<h4 id="_registering_the_service_14">8.3.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -6060,7 +6443,7 @@ implementation of <code>DomainObjectContainer</code> service is automatically re
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_EventBusService">7.4. <code>EventBusService</code></h3>
+<h3 id="_rgsvc_api_EventBusService">8.4. <code>EventBusService</code></h3>
<div class="paragraph">
<p>The <code>EventBusService</code> allows domain objects to emit events to subscribing domain services using an in-memory event bus.</p>
</div>
@@ -6096,7 +6479,7 @@ implementation of <code>DomainObjectContainer</code> service is automatically re
<p>Two implementations are available, using either <a href="https://code.google.com/p/guava-libraries/">Guava</a>'s <a href="https://code.google.com/p/guava-libraries/wiki/EventBusExplained"><code>EventBus</code></a>, or alternatively using the <a href="http://www.axonframework.org/">AxonFramework</a>'s <a href="http://www.axonframework.org/docs/2.4/single.html#d5e1489">SimpleEventBus</a>. It is also possible to plug in a custom implementation.</p>
</div>
<div class="sect3">
-<h4 id="_rgsvc_api_EventBusService_api-and-implementation">7.4.1. API & Implementation</h4>
+<h4 id="_rgsvc_api_EventBusService_api-and-implementation">8.4.1. API & Implementation</h4>
<div class="paragraph">
<p>The API defined by <code>EventBusService</code> is:</p>
</div>
@@ -6133,7 +6516,7 @@ implementation of <code>DomainObjectContainer</code> service is automatically re
</div>
</div>
<div class="sect3">
-<h4 id="_registering_subscribers">7.4.2. Registering Subscribers</h4>
+<h4 id="_registering_subscribers">8.4.2. Registering Subscribers</h4>
<div class="paragraph">
<p>The <code>register()</code> method should be called in the <a href="rgant.html#_rgant-PostConstruct"><code>@PostConstruct</code></a> lifecycle method. It is valid and probably the least confusing to readers to also "unregister" in the <a href="rgant.html#_rgant-PreDestroy"><code>@PreDestroy</code></a> lifecycle method (though as noted <a href="#_rgsvc_api_EventBusService_api-and-implementation">above</a>, unregistering is actually a no-op).</p>
</div>
@@ -6205,7 +6588,7 @@ registration. As a convenience, it is also annotated with the
</div>
</div>
<div class="sect3">
-<h4 id="_annotating_members">7.4.3. Annotating Members</h4>
+<h4 id="_annotating_members">8.4.3. Annotating Members</h4>
<div class="paragraph">
<p>As discussed in the introduction, the framework will automatically emit domain events for all of the object members (actions, properties or collections) of an object whenever that object is rendered or (more generally) interacted with.</p>
</div>
@@ -6296,7 +6679,7 @@ registration. As a convenience, it is also annotated with the
</div>
</div>
<div class="sect3">
-<h4 id="_rgsvc_api_EventBusService_event-hierarchy">7.4.4. Event hierarchy</h4>
+<h4 id="_rgsvc_api_EventBusService_event-hierarchy">8.4.4. Event hierarchy</h4>
<div class="paragraph">
<p>By creating domain event subtypes we can be more semantically precise and in turn providesmore flexibility for subscribers: they can choose whether to be broadly applicable (by subscribing to a superclass) or to be tightly focussed (by subscribing to a subclass).</p>
</div>
@@ -6417,7 +6800,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
-<h4 id="_programmatic_posting">7.4.5. Programmatic posting</h4>
+<h4 id="_programmatic_posting">8.4.5. Programmatic posting</h4>
<div class="paragraph">
<p>To programmatically post an event, simply call <code>#post()</code>.</p>
</div>
@@ -6449,7 +6832,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
-<h4 id="_using_code_wrapperfactory_code">7.4.6. Using <code>WrapperFactory</code></h4>
+<h4 id="_using_code_wrapperfactory_code">8.4.6. Using <code>WrapperFactory</code></h4>
<div class="paragraph">
<p>An alternative way to cause events to be posted is through the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>. This is useful when you wish to enforce a (lack-of-) trust boundary between the caller and the callee.</p>
</div>
@@ -6479,7 +6862,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_spi">7.4.7. Implementation SPI</h4>
+<h4 id="_implementation_spi">8.4.7. Implementation SPI</h4>
<div class="paragraph">
<p>The implementation of <code>EventBusService</code> provided by Apache Isis will by default use <a href="https://code.google.com/p/guava-libraries/">Guava</a>'s <a href="https://code.google.com/p/guava-libraries/wiki/EventBusExplained"><code>EventBus</code></a> as the underlying in-memory event bus. Alternatively the <a href="http://www.axonframework.org/">AxonFramework</a>'s <a href="http://www.axonframework.org/docs/2.4/single.html#d5e1489">SimpleEventBus</a> can be used. Which is used is specified through configuration property (described <a href="#_rgsvc_api_EventBusService_Configuration">below</a>).</p>
</div>
@@ -6521,7 +6904,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
-<h4 id="_rgsvc_api_EventBusService_Configuration">7.4.8. Configuration</h4>
+<h4 id="_rgsvc_api_EventBusService_Configuration">8.4.8. Configuration</h4>
<div class="paragraph">
<p>The implementation of <code>EventBusService</code> provided by Apache Isis will by default use <a href="https://code.google.com/p/guava-libraries/">Guava</a>'s <a href="https://code.google.com/p/guava-libraries/wiki/EventBusExplained"><code>EventBus</code></a> as the underlying in-memory event bus. Alternatively the <a href="http://www.axonframework.org/">AxonFramework</a>'s <a href="http://www.axonframework.org/docs/2.4/single.html#d5e1489">SimpleEventBus</a> can be used.</p>
</div>
@@ -6562,7 +6945,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_services_15">7.4.9. Registering the Services</h4>
+<h4 id="_registering_the_services_15">8.4.9. Registering the Services</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -6576,7 +6959,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_18">7.4.10. Related Services</h4>
+<h4 id="_related_services_18">8.4.10. Related Services</h4>
<div class="paragraph">
<p>The <code>EventBusService</code> is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).</p>
</div>
@@ -6586,7 +6969,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_FactoryService">7.5. <code>FactoryService</code></h3>
+<h3 id="_rgsvc_api_FactoryService">8.5. <code>FactoryService</code></h3>
<div class="paragraph">
<p>The <code>FactoryService</code> collects together methods for instantiating domain objects.</p>
</div>
@@ -6605,7 +6988,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_5">7.5.1. API</h4>
+<h4 id="_api_5">8.5.1. API</h4>
<div class="paragraph">
<p>The API of <code>FactoryService</code> is:</p>
</div>
@@ -6647,7 +7030,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_usage_10">7.5.2. Usage</h4>
+<h4 id="_usage_10">8.5.2. Usage</h4>
<div class="paragraph">
<p>For example:</p>
</div>
@@ -6661,13 +7044,13 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_24">7.5.3. Implementation</h4>
+<h4 id="_implementation_24">8.5.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.factory.FactoryServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_15">7.5.4. Registering the Service</h4>
+<h4 id="_registering_the_service_15">8.5.4. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -6681,7 +7064,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_19">7.5.5. Related Services</h4>
+<h4 id="_related_services_19">8.5.5. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a> is often used in conjunction with the <code>FactoryService</code>, to persist domain objects after they have been instantiated and populated.</p>
</div>
@@ -6693,12 +7076,12 @@ instantiated object.</p>
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_Scratchpad">7.6. <code>Scratchpad</code></h3>
+<h3 id="_rgsvc_api_Scratchpad">8.6. <code>Scratchpad</code></h3>
<div class="paragraph">
<p>The <code>Scratchpad</code> service is a <a href="../../more-advanced-topics/how-to-09-020-How-to-write-a-typical-domain-service.html">request-scoped</a> service to allow objects to exchange information even if they do not directly call each other.</p>
</div>
<div class="sect3">
-<h4 id="_api_implementation_7">7.6.1. API & Implementation</h4>
+<h4 id="_api_implementation_7">8.6.1. API & Implementation</h4>
<div class="paragraph">
<p>The API of <code>Scratchpad</code> service is:</p>
</div>
@@ -6720,7 +7103,7 @@ instantiated object.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_usage_11">7.6.2. Usage</h4>
+<h4 id="_usage_11">8.6.2. Usage</h4>
<div class="paragraph">
<p>The most common use-case is for <a href="rgant.html#_rgant-Action_invokeOn">bulk</a> actions that act upon multiple objects in a list. The (same) <code>Scratchpad</code> service is injected into each of these objects, and so they can use pass information.</p>
</div>
@@ -6810,7 +7193,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_16">7.6.3. Registering the Service</h4>
+<h4 id="_registering_the_service_16">8.6.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -6824,7 +7207,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_20">7.6.4. Related Services</h4>
+<h4 id="_related_services_20">8.6.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_api_ActionInteractionContext"><code>ActionInteractionContext</code></a> service allows <a href="rgant.html#_rgant-Action_invokeOn">bulk actions</a> to co-ordinate with each other.</p>
</div>
@@ -6834,7 +7217,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_UserService">7.7. <code>UserService</code></h3>
+<h3 id="_rgsvc_api_UserService">8.7. <code>UserService</code></h3>
<div class="paragraph">
<p>The <code>UserService</code> allows the domain object to obtain the identity of the user interacting with said object.</p>
</div>
@@ -6853,7 +7236,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_and_usage_3">7.7.1. API and Usage</h4>
+<h4 id="_api_and_usage_3">8.7.1. API and Usage</h4>
<div class="paragraph">
<p>The API of <code>UserService</code> is:</p>
</div>
@@ -6900,13 +7283,13 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_25">7.7.2. Implementation</h4>
+<h4 id="_implementation_25">8.7.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.user.UserServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_17">7.7.3. Registering the Service</h4>
+<h4 id="_registering_the_service_17">8.7.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -6923,7 +7306,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect1">
-<h2 id="_rgsvc_integration-api">8. Integration API</h2>
+<h2 id="_rgsvc_integration-api">9. Integration API</h2>
<div class="sectionbody">
<div class="paragraph">
<p>The integration APIs provide functionality to the domain objects to integrate with other bounded contexts, for example sending an email or serializing an object out to XML.</p>
@@ -6932,7 +7315,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<p>The table below summarizes the integration APIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
</div>
<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 7. Integration API</caption>
+<
<TRUNCATED>
[3/7] isis-site git commit: ISIS-1291: commands,
publishing and interaction context
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/3eb5a1da/content/guides/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.pdf b/content/guides/rgsvc.pdf
index aa89bdc..e285785 100644
--- a/content/guides/rgsvc.pdf
+++ b/content/guides/rgsvc.pdf
@@ -4,16 +4,16 @@
<< /Title (Domain Services)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160426190406+01'00')
-/ModDate (D:20160426190406+01'00')
+/CreationDate (D:20160513191524+01'00')
+/ModDate (D:20160513191524+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
-/Names 16 0 R
-/Outlines 1988 0 R
-/PageLabels 2067 0 R
+/Names 18 0 R
+/Outlines 2206 0 R
+/PageLabels 2296 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 161
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 34 0 R 46 0 R 58 0 R 66 0 R 69 0 R 90 0 R 125 0 R 159 0 R 170 0 R 181 0 R 188 0 R 199 0 R 207 0 R 213 0 R 217 0 R 223 0 R 231 0 R 245 0 R 261 0 R 276 0 R 297 0 R 309 0 R 328 0 R 338 0 R 350 0 R 366 0 R 381 0 R 390 0 R 396 0 R 416 0 R 425 0 R 429 0 R 435 0 R 440 0 R 453 0 R 463 0 R 465 0 R 478 0 R 512 0 R 553 0 R 562 0 R 574 0 R 580 0 R 591 0 R 601 0 R 615 0 R 628 0 R 630 0 R 632 0 R 634 0 R 645 0 R 652 0 R 658 0 R 665 0 R 679 0 R 687 0 R 698 0 R 708 0 R 718 0 R 730 0 R 736 0 R 750 0 R 757 0 R 780 0 R 788 0 R 802 0 R 821 0 R 834 0 R 848 0 R 876 0 R 902 0 R 907 0 R 913 0 R 920 0 R 930 0 R 946 0 R 958 0 R 960 0 R 971 0 R 981 0 R 985 0 R 993 0 R 1000 0 R 1007 0 R 1023 0 R 1035 0 R 1043 0 R 1048 0 R 1051 0 R 1057 0 R 1066 0 R 1078 0 R 1092 0 R 1106 0 R 1112 0 R 1124 0 R 1133 0 R 1137 0 R 1166 0 R 1185 0 R 1188 0 R 1203 0 R 1220 0 R 1226 0 R 1241 0 R 1247 0 R 1254 0 R 1270 0 R 1272 0 R 1279 0 R 1292 0 R 1297 0 R 1299 0 R 1303 0 R 1314 0 R 1342 0 R 1360 0
R 1370 0 R 1377 0 R 1388 0 R 1403 0 R 1420 0 R 1431 0 R 1466 0 R 1481 0 R 1489 0 R 1497 0 R 1499 0 R 1525 0 R 1535 0 R 1540 0 R 1547 0 R 1551 0 R 1563 0 R 1566 0 R 1572 0 R 1583 0 R 1586 0 R 1592 0 R 1595 0 R 1599 0 R 1604 0 R 1612 0 R 1632 0 R 1644 0 R 1659 0 R 1671 0 R 1676 0 R 1688 0 R 1699 0 R 1710 0 R 1712 0 R 1727 0 R 1732 0 R 1740 0 R 1747 0 R 1765 0 R]
+/Count 173
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 36 0 R 48 0 R 59 0 R 68 0 R 74 0 R 104 0 R 106 0 R 127 0 R 162 0 R 196 0 R 207 0 R 218 0 R 225 0 R 238 0 R 244 0 R 250 0 R 254 0 R 260 0 R 268 0 R 283 0 R 298 0 R 313 0 R 334 0 R 347 0 R 365 0 R 375 0 R 387 0 R 403 0 R 418 0 R 427 0 R 433 0 R 453 0 R 463 0 R 467 0 R 472 0 R 477 0 R 490 0 R 500 0 R 502 0 R 515 0 R 542 0 R 580 0 R 601 0 R 610 0 R 622 0 R 633 0 R 643 0 R 655 0 R 668 0 R 680 0 R 682 0 R 684 0 R 694 0 R 702 0 R 704 0 R 715 0 R 720 0 R 732 0 R 740 0 R 751 0 R 760 0 R 770 0 R 782 0 R 788 0 R 802 0 R 809 0 R 832 0 R 841 0 R 854 0 R 875 0 R 884 0 R 901 0 R 905 0 R 921 0 R 925 0 R 953 0 R 979 0 R 984 0 R 990 0 R 998 0 R 1009 0 R 1026 0 R 1037 0 R 1039 0 R 1050 0 R 1060 0 R 1064 0 R 1072 0 R 1079 0 R 1086 0 R 1103 0 R 1115 0 R 1122 0 R 1126 0 R 1129 0 R 1135 0 R 1144 0 R 1156 0 R 1170 0 R 1183 0 R 1189 0 R 1201 0 R 1210 0 R 1214 0 R 1243 0 R 1262 0 R 1265 0 R 1280 0 R 1298 0 R 1304 0 R 1319 0 R 1325 0 R 1332 0 R 1348 0 R 1350 0 R 1361 0
R 1369 0 R 1373 0 R 1376 0 R 1384 0 R 1391 0 R 1419 0 R 1437 0 R 1447 0 R 1454 0 R 1465 0 R 1477 0 R 1494 0 R 1505 0 R 1540 0 R 1560 0 R 1568 0 R 1576 0 R 1578 0 R 1609 0 R 1619 0 R 1624 0 R 1631 0 R 1635 0 R 1646 0 R 1650 0 R 1656 0 R 1667 0 R 1670 0 R 1676 0 R 1679 0 R 1683 0 R 1688 0 R 1696 0 R 1722 0 R 1733 0 R 1748 0 R 1761 0 R 1766 0 R 1777 0 R 1790 0 R 1800 0 R 1818 0 R 1827 0 R 1833 0 R 1839 0 R 1856 0 R 1862 0 R 1871 0 R 1877 0 R 1908 0 R 1911 0 R 1928 0 R]
>>
endobj
4 0 obj
@@ -80,15 +80,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABY+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2069 0 R
+/FontDescriptor 2298 0 R
/FirstChar 32
/LastChar 255
-/Widths 2071 0 R
-/ToUnicode 2070 0 R
+/Widths 2300 0 R
+/ToUnicode 2299 0 R
>>
endobj
9 0 obj
-<< /Length 35881
+<< /Length 36383
>>
stream
q
@@ -271,7 +271,7 @@ ET
BT
60.24 677.9359999999999 Td
/F1.0 10.5 Tf
-<322e322e205075626c696320415049> Tj
+<322e322e205075626c69632041504920767320496e7465726e616c205365727669636573> Tj
ET
0.000 0.000 0.000 SCN
@@ -280,9 +280,9 @@ ET
0.200 0.200 0.200 SCN
BT
-133.6287499999999 677.9359999999999 Td
+235.17424999999992 677.9359999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -380,7 +380,7 @@ ET
BT
541.1705 640.9759999999999 Td
/F1.0 10.5 Tf
-<33> Tj
+<34> Tj
ET
0.000 0.000 0.000 SCN
@@ -389,9 +389,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 622.4959999999999 Td
+60.24 622.4959999999999 Td
/F1.0 10.5 Tf
-[<332e2050726573656e746174696f6e204c61> 20.01953125 <79657220535049>] TJ
+<322e352e20436f6d6d616e6420616e64204576656e74732028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+195.72150000000002 622.4959999999999 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
0.000 0.000 0.000 SCN
@@ -400,9 +411,20 @@ ET
0.200 0.200 0.200 SCN
BT
-176.38474999999988 622.4959999999999 Td
+274.4715 622.4959999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+283.2747499999999 622.4959999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -420,7 +442,7 @@ ET
BT
541.1705 622.4959999999999 Td
/F1.0 10.5 Tf
-<36> Tj
+<35> Tj
ET
0.000 0.000 0.000 SCN
@@ -429,20 +451,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 604.0159999999998 Td
+48.24 604.0159999999998 Td
/F1.0 10.5 Tf
-<332e312e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 604.0159999999998 Td
-/F3.0 10.5 Tf
-<436f6e74656e744d617070696e6753657276696365> Tj
+[<332e2050726573656e746174696f6e204c61> 20.01953125 <79657220535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -451,9 +462,9 @@ ET
0.200 0.200 0.200 SCN
BT
-192.4182499999999 604.0159999999998 Td
+176.38474999999988 604.0159999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -471,7 +482,7 @@ ET
BT
541.1705 604.0159999999998 Td
/F1.0 10.5 Tf
-<39> Tj
+<38> Tj
ET
0.000 0.000 0.000 SCN
@@ -482,7 +493,7 @@ ET
BT
60.24 585.5359999999998 Td
/F1.0 10.5 Tf
-<332e322e20> Tj
+<332e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -493,7 +504,7 @@ ET
BT
79.9485 585.5359999999998 Td
/F3.0 10.5 Tf
-<456d61696c4e6f74696669636174696f6e53657276696365> Tj
+<436f6e74656e744d617070696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -502,9 +513,9 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 585.5359999999998 Td
+191.89324999999997 585.5359999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -522,7 +533,7 @@ ET
BT
535.3009999999999 585.5359999999998 Td
/F1.0 10.5 Tf
-<3130> Tj
+<3131> Tj
ET
0.000 0.000 0.000 SCN
@@ -533,7 +544,7 @@ ET
BT
60.24 567.0559999999998 Td
/F1.0 10.5 Tf
-<332e332e20> Tj
+<332e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -544,7 +555,7 @@ ET
BT
79.9485 567.0559999999998 Td
/F3.0 10.5 Tf
-<4572726f725265706f7274696e6753657276696365> Tj
+<456d61696c4e6f74696669636174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -553,9 +564,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 567.0559999999998 Td
+207.92674999999997 567.0559999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -584,7 +595,7 @@ ET
BT
60.24 548.5759999999998 Td
/F1.0 10.5 Tf
-<332e342e20> Tj
+<332e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -595,7 +606,7 @@ ET
BT
79.9485 548.5759999999998 Td
/F3.0 10.5 Tf
-<457863657074696f6e5265636f676e697a6572> Tj
+<4572726f725265706f7274696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -604,9 +615,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 548.5759999999998 Td
+191.89324999999997 548.5759999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -624,7 +635,7 @@ ET
BT
535.3009999999999 548.5759999999998 Td
/F1.0 10.5 Tf
-<3135> Tj
+<3134> Tj
ET
0.000 0.000 0.000 SCN
@@ -635,7 +646,7 @@ ET
BT
60.24 530.0959999999998 Td
/F1.0 10.5 Tf
-<332e352e20> Tj
+<332e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -646,7 +657,7 @@ ET
BT
79.9485 530.0959999999998 Td
/F3.0 10.5 Tf
-<4772696453797374656d53657276696365> Tj
+<457863657074696f6e5265636f676e697a6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -655,9 +666,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 530.0959999999998 Td
+181.20424999999994 530.0959999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -686,7 +697,7 @@ ET
BT
60.24 511.6159999999998 Td
/F1.0 10.5 Tf
-<332e362e20> Tj
+<332e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -697,7 +708,7 @@ ET
BT
79.9485 511.6159999999998 Td
/F3.0 10.5 Tf
-<477269644c6f6164657253657276696365> Tj
+<4772696453797374656d53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -737,7 +748,7 @@ ET
BT
60.24 493.1359999999998 Td
/F1.0 10.5 Tf
-<332e372e20> Tj
+<332e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -748,7 +759,7 @@ ET
BT
79.9485 493.1359999999998 Td
/F3.0 10.5 Tf
-<4772696453657276696365> Tj
+<477269644c6f6164657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -757,9 +768,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 493.1359999999998 Td
+170.51524999999992 493.1359999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -777,7 +788,7 @@ ET
BT
535.3009999999999 493.1359999999998 Td
/F1.0 10.5 Tf
-<3230> Tj
+<3231> Tj
ET
0.000 0.000 0.000 SCN
@@ -788,7 +799,7 @@ ET
BT
60.24 474.6559999999998 Td
/F1.0 10.5 Tf
-<332e382e20> Tj
+<332e372e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -799,7 +810,7 @@ ET
BT
79.9485 474.6559999999998 Td
/F3.0 10.5 Tf
-<48696e7453746f7265> Tj
+<4772696453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -808,9 +819,9 @@ ET
0.200 0.200 0.200 SCN
BT
-133.10374999999993 474.6559999999998 Td
+138.44824999999992 474.6559999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -828,7 +839,7 @@ ET
BT
535.3009999999999 474.6559999999998 Td
/F1.0 10.5 Tf
-<3231> Tj
+<3232> Tj
ET
0.000 0.000 0.000 SCN
@@ -839,7 +850,7 @@ ET
BT
60.24 456.17599999999976 Td
/F1.0 10.5 Tf
-<332e392e20> Tj
+<332e382e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -850,7 +861,7 @@ ET
BT
79.9485 456.17599999999976 Td
/F3.0 10.5 Tf
-<4c6f63616c6550726f7669646572> Tj
+<48696e7453746f7265> Tj
ET
0.000 0.000 0.000 SCN
@@ -859,9 +870,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 456.17599999999976 Td
+133.10374999999993 456.17599999999976 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -890,7 +901,7 @@ ET
BT
60.24 437.69599999999974 Td
/F1.0 10.5 Tf
-<332e31302e20> Tj
+<332e392e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -899,9 +910,9 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 437.69599999999974 Td
+79.9485 437.69599999999974 Td
/F3.0 10.5 Tf
-<526f7574696e6753657276696365> Tj
+<4c6f63616c6550726f7669646572> Tj
ET
0.000 0.000 0.000 SCN
@@ -910,9 +921,9 @@ ET
0.200 0.200 0.200 SCN
BT
-165.17074999999994 437.69599999999974 Td
+154.48174999999992 437.69599999999974 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -930,7 +941,7 @@ ET
BT
535.3009999999999 437.69599999999974 Td
/F1.0 10.5 Tf
-<3234> Tj
+<3235> Tj
ET
0.000 0.000 0.000 SCN
@@ -941,7 +952,7 @@ ET
BT
60.24 419.2159999999997 Td
/F1.0 10.5 Tf
-<332e31312e20> Tj
+<332e31302e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -952,7 +963,7 @@ ET
BT
85.81800000000001 419.2159999999997 Td
/F3.0 10.5 Tf
-<5472616e736c6174696f6e53657276696365> Tj
+<526f7574696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -961,9 +972,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 419.2159999999997 Td
+165.17074999999994 419.2159999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -981,7 +992,7 @@ ET
BT
535.3009999999999 419.2159999999997 Td
/F1.0 10.5 Tf
-<3235> Tj
+<3236> Tj
ET
0.000 0.000 0.000 SCN
@@ -992,7 +1003,7 @@ ET
BT
60.24 400.7359999999997 Td
/F1.0 10.5 Tf
-<332e31322e20> Tj
+<332e31312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1003,7 +1014,7 @@ ET
BT
85.81800000000001 400.7359999999997 Td
/F3.0 10.5 Tf
-<5472616e736c6174696f6e735265736f6c766572> Tj
+<5472616e736c6174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1012,9 +1023,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 400.7359999999997 Td
+181.20424999999994 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1032,7 +1043,7 @@ ET
BT
535.3009999999999 400.7359999999997 Td
/F1.0 10.5 Tf
-<3236> Tj
+<3237> Tj
ET
0.000 0.000 0.000 SCN
@@ -1043,7 +1054,7 @@ ET
BT
60.24 382.2559999999997 Td
/F1.0 10.5 Tf
-<332e31332e20> Tj
+<332e31322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1054,7 +1065,7 @@ ET
BT
85.81800000000001 382.2559999999997 Td
/F3.0 10.5 Tf
-<55726c456e636f64696e6753657276696365> Tj
+<5472616e736c6174696f6e735265736f6c766572> Tj
ET
0.000 0.000 0.000 SCN
@@ -1063,9 +1074,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 382.2559999999997 Td
+191.89324999999997 382.2559999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1083,7 +1094,7 @@ ET
BT
535.3009999999999 382.2559999999997 Td
/F1.0 10.5 Tf
-<3237> Tj
+<3238> Tj
ET
0.000 0.000 0.000 SCN
@@ -1094,7 +1105,7 @@ ET
BT
60.24 363.77599999999967 Td
/F1.0 10.5 Tf
-<332e31342e20> Tj
+<332e31332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1105,7 +1116,7 @@ ET
BT
85.81800000000001 363.77599999999967 Td
/F3.0 10.5 Tf
-<5573657250726f66696c6553657276696365> Tj
+<55726c456e636f64696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1134,7 +1145,7 @@ ET
BT
535.3009999999999 363.77599999999967 Td
/F1.0 10.5 Tf
-<3238> Tj
+<3239> Tj
ET
0.000 0.000 0.000 SCN
@@ -1143,9 +1154,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 345.29599999999965 Td
+60.24 345.29599999999965 Td
/F1.0 10.5 Tf
-[<342e2050726573656e746174696f6e204c61> 20.01953125 <79657220696e7465726e616c20535049>] TJ
+<332e31342e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 345.29599999999965 Td
+/F3.0 10.5 Tf
+<5573657250726f66696c6553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1154,9 +1176,9 @@ ET
0.200 0.200 0.200 SCN
BT
-218.61574999999993 345.29599999999965 Td
+181.20424999999994 345.29599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1183,20 +1205,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 326.81599999999963 Td
+48.24 326.81599999999963 Td
/F1.0 10.5 Tf
-<342e312e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 326.81599999999963 Td
-/F3.0 10.5 Tf
-<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
+[<342e2050726573656e746174696f6e204c61> 20.01953125 <79657220696e7465726e616c20535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1205,9 +1216,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 326.81599999999963 Td
+218.61574999999993 326.81599999999963 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1225,7 +1236,7 @@ ET
BT
535.3009999999999 326.81599999999963 Td
/F1.0 10.5 Tf
-<3330> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -1236,7 +1247,7 @@ ET
BT
60.24 308.3359999999996 Td
/F1.0 10.5 Tf
-<342e322e20> Tj
+<342e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1247,7 +1258,7 @@ ET
BT
79.9485 308.3359999999996 Td
/F3.0 10.5 Tf
-<526570726573656e746174696f6e53657276696365> Tj
+<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1256,9 +1267,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 308.3359999999996 Td
+213.27124999999995 308.3359999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1276,7 +1287,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3336> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -1285,9 +1296,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 289.8559999999996 Td
+60.24 289.8559999999996 Td
/F1.0 10.5 Tf
-[<352e204170706c69636174696f6e204c61> 20.01953125 <79657220415049>] TJ
+<342e322e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+79.9485 289.8559999999996 Td
+/F3.0 10.5 Tf
+<526570726573656e746174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1296,9 +1318,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 289.8559999999996 Td
+191.89324999999997 289.8559999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1316,7 +1338,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3339> Tj
+<3338> Tj
ET
0.000 0.000 0.000 SCN
@@ -1325,20 +1347,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 271.3759999999996 Td
+48.24 271.3759999999996 Td
/F1.0 10.5 Tf
-<352e312e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 271.3759999999996 Td
-/F3.0 10.5 Tf
-<41636365707448656164657253657276696365> Tj
+[<352e204170706c69636174696f6e204c61> 20.01953125 <79657220415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1347,9 +1358,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 271.3759999999996 Td
+170.51524999999992 271.3759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1367,7 +1378,7 @@ ET
BT
535.3009999999999 271.3759999999996 Td
/F1.0 10.5 Tf
-<3430> Tj
+<3431> Tj
ET
0.000 0.000 0.000 SCN
@@ -1378,7 +1389,7 @@ ET
BT
60.24 252.89599999999956 Td
/F1.0 10.5 Tf
-<352e322e20> Tj
+<352e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1389,7 +1400,7 @@ ET
BT
79.9485 252.89599999999956 Td
/F3.0 10.5 Tf
-<416374696f6e496e766f636174696f6e436f6e74657874> Tj
+<41636365707448656164657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1398,9 +1409,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.58224999999993 252.89599999999956 Td
+181.20424999999994 252.89599999999956 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1418,7 +1429,7 @@ ET
BT
535.3009999999999 252.89599999999956 Td
/F1.0 10.5 Tf
-<3432> Tj
+<3433> Tj
ET
0.000 0.000 0.000 SCN
@@ -1429,7 +1440,7 @@ ET
BT
60.24 234.41599999999957 Td
/F1.0 10.5 Tf
-<352e332e20> Tj
+<352e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1440,7 +1451,7 @@ ET
BT
79.9485 234.41599999999957 Td
/F3.0 10.5 Tf
-<4261636b67726f756e6453657276696365> Tj
+<416374696f6e496e766f636174696f6e436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1449,9 +1460,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 234.41599999999957 Td
+202.58224999999993 234.41599999999957 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1469,7 +1480,7 @@ ET
BT
535.3009999999999 234.41599999999957 Td
/F1.0 10.5 Tf
-<3434> Tj
+<3435> Tj
ET
0.000 0.000 0.000 SCN
@@ -1480,7 +1491,7 @@ ET
BT
60.24 215.93599999999958 Td
/F1.0 10.5 Tf
-<352e342e20> Tj
+<352e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1491,7 +1502,7 @@ ET
BT
79.9485 215.93599999999958 Td
/F3.0 10.5 Tf
-<436f6d6d616e64436f6e74657874> Tj
+<4261636b67726f756e645365727669636532> Tj
ET
0.000 0.000 0.000 SCN
@@ -1500,9 +1511,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 215.93599999999958 Td
+175.85974999999996 215.93599999999958 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1520,7 +1531,7 @@ ET
BT
535.3009999999999 215.93599999999958 Td
/F1.0 10.5 Tf
-<3531> Tj
+<3437> Tj
ET
0.000 0.000 0.000 SCN
@@ -1531,7 +1542,7 @@ ET
BT
60.24 197.4559999999996 Td
/F1.0 10.5 Tf
-<352e352e20> Tj
+<352e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1542,7 +1553,7 @@ ET
BT
79.9485 197.4559999999996 Td
/F3.0 10.5 Tf
-<4d65737361676553657276696365> Tj
+<436f6d6d616e64436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1571,7 +1582,7 @@ ET
BT
535.3009999999999 197.4559999999996 Td
/F1.0 10.5 Tf
-<3535> Tj
+<3533> Tj
ET
0.000 0.000 0.000 SCN
@@ -1582,7 +1593,7 @@ ET
BT
60.24 178.9759999999996 Td
/F1.0 10.5 Tf
-<352e362e20> Tj
+<352e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1593,7 +1604,7 @@ ET
BT
79.9485 178.9759999999996 Td
/F3.0 10.5 Tf
-<53657373696f6e4d616e6167656d656e7453657276696365> Tj
+<496e746572616374696f6e436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1602,9 +1613,42 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 178.9759999999996 Td
+174.4485 178.9759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+180.80100000000002 178.9759999999996 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+259.551 178.9759999999996 Td
+/F1.0 10.5 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+266.71624999999995 178.9759999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1622,7 +1666,7 @@ ET
BT
535.3009999999999 178.9759999999996 Td
/F1.0 10.5 Tf
-<3537> Tj
+<3538> Tj
ET
0.000 0.000 0.000 SCN
@@ -1633,7 +1677,7 @@ ET
BT
60.24 160.4959999999996 Td
/F1.0 10.5 Tf
-<352e372e20> Tj
+<352e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1644,7 +1688,7 @@ ET
BT
79.9485 160.4959999999996 Td
/F3.0 10.5 Tf
-<5469746c6553657276696365> Tj
+<4d65737361676553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1653,9 +1697,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 160.4959999999996 Td
+154.48174999999992 160.4959999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1684,7 +1728,7 @@ ET
BT
60.24 142.01599999999962 Td
/F1.0 10.5 Tf
-<352e382e20> Tj
+<352e372e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1695,7 +1739,7 @@ ET
BT
79.9485 142.01599999999962 Td
/F3.0 10.5 Tf
-<5472616e73616374696f6e53657276696365> Tj
+<53657373696f6e4d616e6167656d656e7453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1704,9 +1748,9 @@ ET
0.200 0.200 0.200 SCN
BT
-175.85974999999996 142.01599999999962 Td
+207.92674999999997 142.01599999999962 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1724,7 +1768,7 @@ ET
BT
535.3009999999999 142.01599999999962 Td
/F1.0 10.5 Tf
-<3539> Tj
+<3630> Tj
ET
0.000 0.000 0.000 SCN
@@ -1735,7 +1779,7 @@ ET
BT
60.24 123.53599999999963 Td
/F1.0 10.5 Tf
-<352e392e20> Tj
+<352e382e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1746,7 +1790,7 @@ ET
BT
79.9485 123.53599999999963 Td
/F3.0 10.5 Tf
-<57726170706572466163746f7279> Tj
+<5469746c6553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1755,9 +1799,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 123.53599999999963 Td
+143.79274999999996 123.53599999999963 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1775,7 +1819,7 @@ ET
BT
535.3009999999999 123.53599999999963 Td
/F1.0 10.5 Tf
-<3630> Tj
+<3631> Tj
ET
0.000 0.000 0.000 SCN
@@ -1784,9 +1828,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 105.05599999999964 Td
+60.24 105.05599999999964 Td
/F1.0 10.5 Tf
-[<362e204170706c69636174696f6e204c61> 20.01953125 <79657220535049>] TJ
+<352e392e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+79.9485 105.05599999999964 Td
+/F3.0 10.5 Tf
+<5472616e73616374696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1795,9 +1850,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 105.05599999999964 Td
+175.85974999999996 105.05599999999964 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1815,7 +1870,7 @@ ET
BT
535.3009999999999 105.05599999999964 Td
/F1.0 10.5 Tf
-<3634> Tj
+<3632> Tj
ET
0.000 0.000 0.000 SCN
@@ -1826,7 +1881,7 @@ ET
BT
60.24 86.57599999999965 Td
/F1.0 10.5 Tf
-<362e312e20> Tj
+<352e31302e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1835,9 +1890,9 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 86.57599999999965 Td
+85.81800000000001 86.57599999999965 Td
/F3.0 10.5 Tf
-<4261636b67726f756e64436f6d6d616e6453657276696365> Tj
+<57726170706572466163746f7279> Tj
ET
0.000 0.000 0.000 SCN
@@ -1846,9 +1901,9 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 86.57599999999965 Td
+165.17074999999994 86.57599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1866,7 +1921,7 @@ ET
BT
535.3009999999999 86.57599999999965 Td
/F1.0 10.5 Tf
-<3635> Tj
+<3633> Tj
ET
0.000 0.000 0.000 SCN
@@ -1875,20 +1930,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 68.09599999999966 Td
+48.24 68.09599999999966 Td
/F1.0 10.5 Tf
-<362e322e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 68.09599999999966 Td
-/F3.0 10.5 Tf
-<436f6d6d616e6453657276696365> Tj
+[<362e204170706c69636174696f6e204c61> 20.01953125 <79657220535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1897,9 +1941,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 68.09599999999966 Td
+170.51524999999992 68.09599999999966 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1932,16 +1976,16 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 9 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 39 0 R
+/F3.0 41 0 R
>>
>>
-/Annots [1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R]
+/Annots [1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R]
>>
endobj
11 0 obj
-<< /Length 36731
+<< /Length 41339
>>
stream
q
@@ -1953,7 +1997,7 @@ q
BT
60.24 794.6759999999999 Td
/F1.0 10.5 Tf
-<362e332e20> Tj
+<362e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1964,7 +2008,7 @@ ET
BT
79.9485 794.6759999999999 Td
/F3.0 10.5 Tf
-<486f6d655061676550726f766964657253657276696365> Tj
+<4261636b67726f756e64436f6d6d616e6453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1973,9 +2017,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.58224999999993 794.6759999999999 Td
+207.92674999999997 794.6759999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1993,7 +2037,7 @@ ET
BT
535.3009999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<3639> Tj
+<3638> Tj
ET
0.000 0.000 0.000 SCN
@@ -2002,9 +2046,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 776.1959999999999 Td
+60.24 776.1959999999999 Td
/F1.0 10.5 Tf
-<372e20436f72652f446f6d61696e20415049> Tj
+<362e322e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+79.9485 776.1959999999999 Td
+/F3.0 10.5 Tf
+<436f6d6d616e6453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2013,9 +2068,9 @@ ET
0.200 0.200 0.200 SCN
BT
-149.13724999999994 776.1959999999999 Td
+154.48174999999992 776.1959999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2044,7 +2099,7 @@ ET
BT
60.24 757.7159999999999 Td
/F1.0 10.5 Tf
-<372e312e20> Tj
+<362e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2055,7 +2110,7 @@ ET
BT
79.9485 757.7159999999999 Td
/F3.0 10.5 Tf
-<436c6f636b53657276696365> Tj
+<486f6d655061676550726f766964657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2064,9 +2119,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 757.7159999999999 Td
+202.58224999999993 757.7159999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2084,7 +2139,7 @@ ET
BT
535.3009999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<3731> Tj
+<3732> Tj
ET
0.000 0.000 0.000 SCN
@@ -2093,20 +2148,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 739.2359999999999 Td
+48.24 739.2359999999999 Td
/F1.0 10.5 Tf
-<372e322e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 739.2359999999999 Td
-/F3.0 10.5 Tf
-<436f6e66696775726174696f6e53657276696365> Tj
+[<372e204170706c69636174696f6e204c61> 20.01953125 <79657220696e7465726e616c20535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -2115,9 +2159,9 @@ ET
0.200 0.200 0.200 SCN
BT
-186.54874999999993 739.2359999999999 Td
+213.27124999999995 739.2359999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2146,7 +2190,7 @@ ET
BT
60.24 720.7559999999999 Td
/F1.0 10.5 Tf
-<372e332e20> Tj
+<372e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2157,7 +2201,7 @@ ET
BT
79.9485 720.7559999999999 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<436f6d6d616e6444746f53657276696365496e7465726e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -2166,9 +2210,42 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 720.7559999999999 Td
+211.19850000000002 720.7559999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+217.55100000000002 720.7559999999999 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+296.301 720.7559999999999 Td
+/F1.0 10.5 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+304.12774999999993 720.7559999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2186,7 +2263,7 @@ ET
BT
535.3009999999999 720.7559999999999 Td
/F1.0 10.5 Tf
-<3735> Tj
+<3734> Tj
ET
0.000 0.000 0.000 SCN
@@ -2197,7 +2274,7 @@ ET
BT
60.24 702.2759999999998 Td
/F1.0 10.5 Tf
-<372e342e20> Tj
+<372e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2208,7 +2285,7 @@ ET
BT
79.9485 702.2759999999998 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<496e746572616374696f6e44746f53657276696365496e7465726e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -2217,27 +2294,31 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 702.2759999999998 Td
+232.19850000000002 702.2759999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2028> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-533.94125 702.2759999999998 Td
-/F1.0 5.25 Tf
-<ca> Tj
+238.55100000000002 702.2759999999998 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
ET
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-535.3009999999999 702.2759999999998 Td
+317.30100000000004 702.2759999999998 Td
/F1.0 10.5 Tf
-<3835> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -2246,20 +2327,27 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 683.7959999999998 Td
+325.5057499999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<372e352e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
BT
-79.9485 683.7959999999998 Td
-/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+533.94125 702.2759999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.3009999999999 702.2759999999998 Td
+/F1.0 10.5 Tf
+<3735> Tj
ET
0.000 0.000 0.000 SCN
@@ -2268,9 +2356,20 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 683.7959999999998 Td
+48.24 683.7959999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<382e20436f72652f446f6d61696e20415049> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+149.13724999999994 683.7959999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2288,7 +2387,7 @@ ET
BT
535.3009999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<3933> Tj
+<3736> Tj
ET
0.000 0.000 0.000 SCN
@@ -2299,7 +2398,7 @@ ET
BT
60.24 665.3159999999998 Td
/F1.0 10.5 Tf
-<372e362e20> Tj
+<382e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2310,7 +2409,7 @@ ET
BT
79.9485 665.3159999999998 Td
/F3.0 10.5 Tf
-<53637261746368706164> Tj
+<436c6f636b53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2319,9 +2418,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 665.3159999999998 Td
+143.79274999999996 665.3159999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2339,7 +2438,7 @@ ET
BT
535.3009999999999 665.3159999999998 Td
/F1.0 10.5 Tf
-<3934> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -2350,7 +2449,7 @@ ET
BT
60.24 646.8359999999998 Td
/F1.0 10.5 Tf
-<372e372e20> Tj
+<382e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2361,7 +2460,7 @@ ET
BT
79.9485 646.8359999999998 Td
/F3.0 10.5 Tf
-<5573657253657276696365> Tj
+<436f6e66696775726174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2370,9 +2469,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 646.8359999999998 Td
+186.54874999999993 646.8359999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2390,7 +2489,7 @@ ET
BT
535.3009999999999 646.8359999999998 Td
/F1.0 10.5 Tf
-<3936> Tj
+<3830> Tj
ET
0.000 0.000 0.000 SCN
@@ -2399,9 +2498,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 628.3559999999998 Td
+60.24 628.3559999999998 Td
/F1.0 10.5 Tf
-[<382e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
+<382e332e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+79.9485 628.3559999999998 Td
+/F3.0 10.5 Tf
+<446f6d61696e4f626a656374436f6e7461696e6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -2410,9 +2520,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 628.3559999999998 Td
+191.89324999999997 628.3559999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2430,7 +2540,7 @@ ET
BT
535.3009999999999 628.3559999999998 Td
/F1.0 10.5 Tf
-<3939> Tj
+<3831> Tj
ET
0.000 0.000 0.000 SCN
@@ -2441,7 +2551,7 @@ ET
BT
60.24 609.8759999999997 Td
/F1.0 10.5 Tf
-<382e312e20> Tj
+<382e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2452,7 +2562,7 @@ ET
BT
79.9485 609.8759999999997 Td
/F3.0 10.5 Tf
-<426f6f6b6d61726b5365727669636532> Tj
+<4576656e7442757353657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2461,16 +2571,16 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 609.8759999999997 Td
+159.82624999999996 609.8759999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-528.07175 609.8759999999997 Td
+533.94125 609.8759999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2479,9 +2589,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 609.8759999999997 Td
+535.3009999999999 609.8759999999997 Td
/F1.0 10.5 Tf
-<313030> Tj
+<3931> Tj
ET
0.000 0.000 0.000 SCN
@@ -2492,7 +2602,7 @@ ET
BT
60.24 591.3959999999997 Td
/F1.0 10.5 Tf
-<382e322e20> Tj
+<382e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2503,7 +2613,7 @@ ET
BT
79.9485 591.3959999999997 Td
/F3.0 10.5 Tf
-<446565704c696e6b53657276696365> Tj
+<466163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2512,16 +2622,16 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 591.3959999999997 Td
+154.48174999999992 591.3959999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-528.07175 591.3959999999997 Td
+533.94125 591.3959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2530,9 +2640,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 591.3959999999997 Td
+535.3009999999999 591.3959999999997 Td
/F1.0 10.5 Tf
-<313032> Tj
+<3939> Tj
ET
0.000 0.000 0.000 SCN
@@ -2543,7 +2653,7 @@ ET
BT
60.24 572.9159999999997 Td
/F1.0 10.5 Tf
-<382e332e20> Tj
+<382e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2554,7 +2664,7 @@ ET
BT
79.9485 572.9159999999997 Td
/F3.0 10.5 Tf
-<456d61696c53657276696365> Tj
+<53637261746368706164> Tj
ET
0.000 0.000 0.000 SCN
@@ -2563,9 +2673,9 @@ ET
0.200 0.200 0.200 SCN
BT
-148.6122499999999 572.9159999999997 Td
+137.92324999999994 572.9159999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2583,7 +2693,7 @@ ET
BT
529.4314999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<313033> Tj
+<313030> Tj
ET
0.000 0.000 0.000 SCN
@@ -2594,7 +2704,7 @@ ET
BT
60.24 554.4359999999997 Td
/F1.0 10.5 Tf
-<382e342e20> Tj
+<382e372e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2605,7 +2715,7 @@ ET
BT
79.9485 554.4359999999997 Td
/F3.0 10.5 Tf
-<47756963654265616e50726f7669646572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2614,9 +2724,9 @@ ET
0.200 0.200 0.200 SCN
BT
-169.99024999999995 554.4359999999997 Td
+143.26774999999992 554.4359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2634,7 +2744,7 @@ ET
BT
529.4314999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<313035> Tj
+<313032> Tj
ET
0.000 0.000 0.000 SCN
@@ -2643,20 +2753,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 535.9559999999997 Td
+48.24 535.9559999999997 Td
/F1.0 10.5 Tf
-<382e352e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 535.9559999999997 Td
-/F3.0 10.5 Tf
-<4a61786253657276696365> Tj
+[<392e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -2665,9 +2764,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 535.9559999999997 Td
+137.92324999999994 535.9559999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2685,7 +2784,7 @@ ET
BT
529.4314999999999 535.9559999999997 Td
/F1.0 10.5 Tf
-<313037> Tj
+<313035> Tj
ET
0.000 0.000 0.000 SCN
@@ -2696,7 +2795,7 @@ ET
BT
60.24 517.4759999999997 Td
/F1.0 10.5 Tf
-<382e362e20> Tj
+<392e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2707,7 +2806,7 @@ ET
BT
79.9485 517.4759999999997 Td
/F3.0 10.5 Tf
-<4d656d656e746f53657276696365> Tj
+<426f6f6b6d61726b5365727669636532> Tj
ET
0.000 0.000 0.000 SCN
@@ -2716,9 +2815,9 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 517.4759999999997 Td
+164.6457499999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2736,7 +2835,7 @@ ET
BT
529.4314999999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<313038> Tj
+<313036> Tj
ET
0.000 0.000 0.000 SCN
@@ -2747,7 +2846,7 @@ ET
BT
60.24 498.9959999999997 Td
/F1.0 10.5 Tf
-<382e372e20> Tj
+<392e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2758,7 +2857,7 @@ ET
BT
79.9485 498.9959999999997 Td
/F3.0 10.5 Tf
-<586d6c536e617073686f7453657276696365> Tj
+<446565704c696e6b53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2767,9 +2866,9 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 498.9959999999997 Td
+164.6457499999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2787,7 +2886,7 @@ ET
BT
529.4314999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<313131> Tj
+<313038> Tj
ET
0.000 0.000 0.000 SCN
@@ -2796,9 +2895,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 480.5159999999997 Td
+60.24 480.5159999999997 Td
/F1.0 10.5 Tf
-<392e204d6574616461746120415049> Tj
+<392e332e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+79.9485 480.5159999999997 Td
+/F3.0 10.5 Tf
+<456d61696c53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2807,9 +2917,9 @@ ET
0.200 0.200 0.200 SCN
BT
-132.5787499999999 480.5159999999997 Td
+148.6122499999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2827,7 +2937,7 @@ ET
BT
529.4314999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<313136> Tj
+<313039> Tj
ET
0.000 0.000 0.000 SCN
@@ -2838,7 +2948,7 @@ ET
BT
60.24 462.03599999999966 Td
/F1.0 10.5 Tf
-<392e312e20> Tj
+<392e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2849,7 +2959,7 @@ ET
BT
79.9485 462.03599999999966 Td
/F3.0 10.5 Tf
-<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
+<47756963654265616e50726f7669646572> Tj
ET
0.000 0.000 0.000 SCN
@@ -2858,9 +2968,9 @@ ET
0.200 0.200 0.200 SCN
BT
-228.77974999999992 462.03599999999966 Td
+169.99024999999995 462.03599999999966 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2878,7 +2988,7 @@ ET
BT
529.4314999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313137> Tj
+<313131> Tj
ET
0.000 0.000 0.000 SCN
@@ -2889,7 +2999,7 @@ ET
BT
60.24 443.55599999999964 Td
/F1.0 10.5 Tf
-<392e322e20> Tj
+<392e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2900,7 +3010,7 @@ ET
BT
79.9485 443.55599999999964 Td
/F3.0 10.5 Tf
-<4c61796f757453657276696365> Tj
+<4a61786253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2909,9 +3019,9 @@ ET
0.200 0.200 0.200 SCN
BT
-153.95674999999994 443.55599999999964 Td
+143.26774999999992 443.55599999999964 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2929,7 +3039,7 @@ ET
BT
529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313138> Tj
+<313133> Tj
ET
0.000 0.000 0.000 SCN
@@ -2940,7 +3050,7 @@ ET
BT
60.24 425.0759999999996 Td
/F1.0 10.5 Tf
-<392e332e20> Tj
+<392e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2951,7 +3061,7 @@ ET
BT
79.9485 425.0759999999996 Td
/F3.0 10.5 Tf
-<4d6574614d6f64656c53657276696365> Tj
+<4d656d656e746f53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2960,9 +3070,9 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 425.0759999999996 Td
+159.30124999999992 425.0759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2980,7 +3090,7 @@ ET
BT
529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313230> Tj
+<313134> Tj
ET
0.000 0.000 0.000 SCN
@@ -2991,7 +3101,7 @@ ET
BT
60.24 406.5959999999996 Td
/F1.0 10.5 Tf
-<392e342e20> Tj
+<392e372e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3002,7 +3112,7 @@ ET
BT
79.9485 406.5959999999996 Td
/F3.0 10.5 Tf
-<536572766963655265676973747279> Tj
+<586d6c536e617073686f7453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -3011,9 +3121,9 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 406.5959999999996 Td
+175.33474999999993 406.5959999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3031,7 +3141,7 @@ ET
BT
529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313231> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3040,20 +3150,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 388.1159999999996 Td
+48.24 388.1159999999996 Td
/F1.0 10.5 Tf
-<392e352e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-79.9485 388.1159999999996 Td
-/F3.0 10.5 Tf
-<5377616767657253657276696365> Tj
+<31302e204d6574616461746120415049> Tj
ET
0.000 0.000 0.000 SCN
@@ -3062,9 +3161,9 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 388.1159999999996 Td
+137.92324999999994 388.1159999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3091,9 +3190,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 369.63599999999957 Td
+60.24 369.63599999999957 Td
/F1.0 10.5 Tf
-[<31302e2054> 29.78515625 <657374696e67>] TJ
+<31302e312e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 369.63599999999957 Td
+/F3.0 10.5 Tf
+<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
ET
0.000 0.000 0.000 SCN
@@ -3102,9 +3212,9 @@ ET
0.200 0.200 0.200 SCN
BT
-105.85624999999993 369.63599999999957 Td
+234.12424999999996 369.63599999999957 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3122,7 +3232,7 @@ ET
BT
529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313234> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3133,7 +3243,7 @@ ET
BT
60.24 351.15599999999955 Td
/F1.0 10.5 Tf
-<31302e312e20> Tj
+<31302e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3144,7 +3254,7 @@ ET
BT
85.81800000000001 351.15599999999955 Td
/F3.0 10.5 Tf
-<466978747572655363726970747344656661756c74> Tj
+<4c61796f757453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -3153,9 +3263,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.05724999999995 351.15599999999955 Td
+159.30124999999992 351.15599999999955 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3184,7 +3294,7 @@ ET
BT
60.24 332.67599999999953 Td
/F1.0 10.5 Tf
-<31302e322e20> Tj
+<31302e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3195,7 +3305,7 @@ ET
BT
85.81800000000001 332.67599999999953 Td
/F3.0 10.5 Tf
-<5375646f53657276696365> Tj
+<4d6574614d6f64656c53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -3204,9 +3314,9 @@ ET
0.200 0.200 0.200 SCN
BT
-148.6122499999999 332.67599999999953 Td
+175.33474999999993 332.67599999999953 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3224,7 +3334,7 @@ ET
BT
529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313236> Tj
ET
0.000 0.000 0.000 SCN
@@ -3235,7 +3345,7 @@ ET
BT
60.24 314.1959999999995 Td
/F1.0 10.5 Tf
-<31302e332e20> Tj
+<31302e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3246,6 +3356,250 @@ ET
BT
85.81800000000001 314.1959999999995 Td
/F3.0 10.5 Tf
+<536572766963655265676973747279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+169.99024999999995 314.1959999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 314.1959999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 314.1959999999995 Td
+/F1.0 10.5 Tf
+<313237> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 295.7159999999995 Td
+/F1.0 10.5 Tf
+<31302e352e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 295.7159999999995 Td
+/F3.0 10.5 Tf
+<5377616767657253657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+164.6457499999999 295.7159999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 295.7159999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 295.7159999999995 Td
+/F1.0 10.5 Tf
+<313238> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 277.2359999999995 Td
+/F1.0 10.5 Tf
+[<31312e2054> 29.78515625 <657374696e67>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+105.85624999999993 277.2359999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 277.2359999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 277.2359999999995 Td
+/F1.0 10.5 Tf
+<313330> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 258.75599999999946 Td
+/F1.0 10.5 Tf
+<31312e312e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 258.75599999999946 Td
+/F3.0 10.5 Tf
+<466978747572655363726970747344656661756c74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.05724999999995 258.75599999999946 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 258.75599999999946 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 258.75599999999946 Td
+/F1.0 10.5 Tf
+<313330> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 240.27599999999947 Td
+/F1.0 10.5 Tf
+<31312e322e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 240.27599999999947 Td
+/F3.0 10.5 Tf
+<5375646f53657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+148.6122499999999 240.27599999999947 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 240.27599999999947 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 240.27599999999947 Td
+/F1.0 10.5 Tf
+<313331> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 221.79599999999948 Td
+/F1.0 10.5 Tf
+<31312e332e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 221.79599999999948 Td
+/F3.0 10.5 Tf
<466978747572655363726970747353706563> Tj
ET
@@ -3255,7 +3609,7 @@ ET
0.694 0.129 0.275 SCN
BT
-180.318 314.1959999999995 Td
+180.318 221.79599999999948 Td
/F5.0 10.5 Tf
<d5> Tj
ET
@@ -3266,7 +3620,7 @@ ET
0.694 0.129 0.275 SCN
BT
-183.342 314.1959999999995 Td
+183.342 221.79599999999948 Td
/F3.0 10.5 Tf
<6e50726f7669646572> Tj
ET
@@ -3277,7 +3631,7 @@ ET
0.200 0.200 0.200 SCN
BT
-239.46874999999994 314.1959999999995 Td
+239.46874999999994 221.79599999999948 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3286,7 +3640,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 314.1959999999995 Td
+528.07175 221.79599999999948 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3295,9 +3649,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 314.1959999999995 Td
+529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313237> Tj
+<313333> Tj
ET
0.000 0.000 0.000 SCN
@@ -3306,9 +3660,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 295.7159999999995 Td
+48.24 203.3159999999995 Td
/F1.0 10.5 Tf
-[<31312e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] TJ
+[<31322e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -3317,7 +3671,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 295.7159999999995 Td
+175.33474999999993 203.3159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3326,7 +3680,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 295.7159999999995 Td
+528.07175 203.3159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3335,9 +3689,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 295.7159999999995 Td
+529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -3346,9 +3700,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 277.2359999999995 Td
+60.24 184.8359999999995 Td
/F1.0 10.5 Tf
-<31312e312e20> Tj
+<31322e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3357,7 +3711,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 277.2359999999995 Td
+85.81800000000001 184.8359999999995 Td
/F3.0 10.5 Tf
<497369734a646f537570706f7274> Tj
ET
@@ -3368,7 +3722,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 277.2359999999995 Td
+164.6457499999999 184.8359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3377,7 +3731,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 277.2359999999995 Td
+528.07175 184.8359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3386,9 +3740,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 277.2359999999995 Td
+529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -3397,9 +3751,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 258.75599999999946 Td
+60.24 166.3559999999995 Td
/F1.0 10.5 Tf
-<31312e322e20> Tj
+<31322e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3408,7 +3762,91 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 258.75599999999946 Td
+85.81800000000001 166.3559999999995 Td
+/F3.0 10.5 Tf
+<4d65747269637353657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+159.318 166.3559999999995 Td
+/F1.0 10.5 Tf
+<2028> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+165.6705 166.3559999999995 Td
+/F3.0 10.5 Tf
+<312e31332e302d534e415053484f54> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+244.4205 166.3559999999995 Td
+/F1.0 10.5 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+250.1577499999999 166.3559999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 166.3559999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 166.3559999999995 Td
+/F1.0 10.5 Tf
+<313430> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24 147.87599999999952 Td
+/F1.0 10.5 Tf
+<31322e332e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+85.81800000000001 147.87599999999952 Td
/F3.0 10.5 Tf
<5175657279526573756c74734361636865> Tj
ET
@@ -3419,7 +3857,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 258.75599999999946 Td
+180.6792499999999 147.87599999999952 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3428,7 +3866,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 258.75599999999946 Td
+528.07175 147.87599999999952 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3437,9 +3875,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 258.75599999999946 Td
+529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313334> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
@@ -3448,9 +3886,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 240.27599999999947 Td
+60.24 129.39599999999953 Td
/F1.0 10.5 Tf
-<31312e332e20> Tj
+<31322e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3459,7 +3897,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 240.27599999999947 Td
+85.81800000000001 129.39599999999953 Td
/F3.0 10.5 Tf
<5265706f7369746f727953657276696365> Tj
ET
@@ -3470,7 +3908,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 240.27599999999947 Td
+180.6792499999999 129.39599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3479,7 +3917,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 240.27599999999947 Td
+528.07175 129.39599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3488,9 +3926,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 240.27599999999947 Td
+529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313337> Tj
+<313433> Tj
ET
0.000 0.000 0.000 SCN
@@ -3499,9 +3937,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 221.79599999999948 Td
+48.24 110.91599999999954 Td
/F1.0 10.5 Tf
-[<31322e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
+[<31332e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -3510,7 +3948,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 221.79599999999948 Td
+175.33474999999993 110.91599999999954 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3519,7 +3957,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 221.79599999999948 Td
+528.07175 110.91599999999954 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3528,9 +3966,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 221.79599999999948 Td
+529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313434> Tj
+<313530> Tj
ET
0.000 0.000 0.000 SCN
@@ -3539,9 +3977,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 203.3159999999995 Td
+60.24 92.43599999999955 Td
/F1.0 10.5 Tf
-<31322e312e20> Tj
+<31332e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3550,7 +3988,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 203.3159999999995 Td
+85.81800000000001 92.43599999999955 Td
/F3.0 10.5 Tf
<4175646974696e675365727669636533> Tj
ET
@@ -3561,7 +3999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.3347499999
<TRUNCATED>