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/15 16:00:20 UTC
[1/3] isis-site git commit: ISIS-1291: updating docs for new
services. Also IsisTransaction now to clears the changed object properties
rather than AuditingService,
otherwise PublisherService would mis-report the metric of number of changed
object prop
Repository: isis-site
Updated Branches:
refs/heads/asf-site 3eb5a1daf -> 86d69a8f9
http://git-wip-us.apache.org/repos/asf/isis-site/blob/86d69a8f/content/guides/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.pdf b/content/guides/rgsvc.pdf
index e285785..ef4a9d1 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:20160513191524+01'00')
-/ModDate (D:20160513191524+01'00')
+/CreationDate (D:20160515164752+01'00')
+/ModDate (D:20160515164752+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 2206 0 R
-/PageLabels 2296 0 R
+/Outlines 2337 0 R
+/PageLabels 2427 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 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]
+/Count 185
+/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 213 0 R 224 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 461 0 R 466 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 609 0 R 621 0 R 632 0 R 641 0 R 654 0 R 668 0 R 680 0 R 682 0 R 684 0 R 686 0 R 697 0 R 704 0 R 706 0 R 717 0 R 723 0 R 740 0 R 748 0 R 753 0 R 769 0 R 779 0 R 788 0 R 799 0 R 809 0 R 819 0 R 825 0 R 842 0 R 846 0 R 852 0 R 875 0 R 884 0 R 897 0 R 918 0 R 928 0 R 945 0 R 950 0 R 970 0 R 980 0 R 993 0 R 1021 0 R 1046 0 R 1052 0 R 1057 0 R 1064 0 R 1075 0 R 1091 0 R 1102 0 R 1104 0 R 1115 0 R 1125 0 R 1129 0 R 1137 0 R 1144 0 R 1151 0 R 1168 0 R 1180 0 R 1187 0 R 1191 0 R 1194 0 R 1200 0 R 1209 0 R 1221 0 R 1235 0 R 1248 0 R 1254 0 R 1267 0 R 1276 0 R 1280 0 R 1309 0 R 1326 0 R 1331 0 R 1347 0 R 1364 0 R 1370 0
R 1385 0 R 1391 0 R 1399 0 R 1414 0 R 1416 0 R 1426 0 R 1435 0 R 1439 0 R 1443 0 R 1450 0 R 1457 0 R 1485 0 R 1501 0 R 1512 0 R 1520 0 R 1534 0 R 1544 0 R 1553 0 R 1569 0 R 1577 0 R 1612 0 R 1627 0 R 1635 0 R 1643 0 R 1645 0 R 1675 0 R 1685 0 R 1691 0 R 1698 0 R 1702 0 R 1712 0 R 1723 0 R 1727 0 R 1733 0 R 1744 0 R 1747 0 R 1753 0 R 1756 0 R 1760 0 R 1765 0 R 1773 0 R 1799 0 R 1810 0 R 1826 0 R 1839 0 R 1844 0 R 1855 0 R 1868 0 R 1879 0 R 1897 0 R 1906 0 R 1912 0 R 1918 0 R 1935 0 R 1941 0 R 1950 0 R 1956 0 R 1987 0 R 2005 0 R 2015 0 R 2030 0 R 2040 0 R 2056 0 R 2063 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABY+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2298 0 R
+/FontDescriptor 2429 0 R
/FirstChar 32
/LastChar 255
-/Widths 2300 0 R
-/ToUnicode 2299 0 R
+/Widths 2431 0 R
+/ToUnicode 2430 0 R
>>
endobj
9 0 obj
@@ -584,7 +584,7 @@ ET
BT
535.3009999999999 567.0559999999998 Td
/F1.0 10.5 Tf
-<3132> Tj
+<3133> Tj
ET
0.000 0.000 0.000 SCN
@@ -1582,7 +1582,7 @@ ET
BT
535.3009999999999 197.4559999999996 Td
/F1.0 10.5 Tf
-<3533> Tj
+<3534> Tj
ET
0.000 0.000 0.000 SCN
@@ -1666,7 +1666,7 @@ ET
BT
535.3009999999999 178.9759999999996 Td
/F1.0 10.5 Tf
-<3538> Tj
+<3539> Tj
ET
0.000 0.000 0.000 SCN
@@ -1717,7 +1717,7 @@ ET
BT
535.3009999999999 160.4959999999996 Td
/F1.0 10.5 Tf
-<3538> Tj
+<3633> Tj
ET
0.000 0.000 0.000 SCN
@@ -1768,7 +1768,7 @@ ET
BT
535.3009999999999 142.01599999999962 Td
/F1.0 10.5 Tf
-<3630> Tj
+<3634> Tj
ET
0.000 0.000 0.000 SCN
@@ -1819,7 +1819,7 @@ ET
BT
535.3009999999999 123.53599999999963 Td
/F1.0 10.5 Tf
-<3631> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -1870,7 +1870,7 @@ ET
BT
535.3009999999999 105.05599999999964 Td
/F1.0 10.5 Tf
-<3632> Tj
+<3636> Tj
ET
0.000 0.000 0.000 SCN
@@ -1921,7 +1921,7 @@ ET
BT
535.3009999999999 86.57599999999965 Td
/F1.0 10.5 Tf
-<3633> Tj
+<3637> Tj
ET
0.000 0.000 0.000 SCN
@@ -1961,7 +1961,7 @@ ET
BT
535.3009999999999 68.09599999999966 Td
/F1.0 10.5 Tf
-<3637> Tj
+<3732> Tj
ET
0.000 0.000 0.000 SCN
@@ -1981,11 +1981,11 @@ endobj
/F3.0 41 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]
+/Annots [2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 R 2142 0 R 2143 0 R 2144 0 R 2145 0 R 2146 0 R 2147 0 R 2148 0 R 2149 0 R 2150 0 R 2151 0 R 2152 0 R 2153 0 R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 R 2173 0 R 2174 0 R]
>>
endobj
11 0 obj
-<< /Length 41339
+<< /Length 41333
>>
stream
q
@@ -2037,7 +2037,7 @@ ET
BT
535.3009999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<3638> Tj
+<3733> Tj
ET
0.000 0.000 0.000 SCN
@@ -2088,7 +2088,7 @@ ET
BT
535.3009999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<3730> Tj
+<3735> Tj
ET
0.000 0.000 0.000 SCN
@@ -2139,7 +2139,7 @@ ET
BT
535.3009999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<3732> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -2179,7 +2179,7 @@ ET
BT
535.3009999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<3734> Tj
+<3739> Tj
ET
0.000 0.000 0.000 SCN
@@ -2263,7 +2263,7 @@ ET
BT
535.3009999999999 720.7559999999999 Td
/F1.0 10.5 Tf
-<3734> Tj
+<3830> Tj
ET
0.000 0.000 0.000 SCN
@@ -2347,7 +2347,7 @@ ET
BT
535.3009999999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<3735> Tj
+<3831> Tj
ET
0.000 0.000 0.000 SCN
@@ -2387,7 +2387,7 @@ ET
BT
535.3009999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<3736> Tj
+<3832> Tj
ET
0.000 0.000 0.000 SCN
@@ -2438,7 +2438,7 @@ ET
BT
535.3009999999999 665.3159999999998 Td
/F1.0 10.5 Tf
-<3737> Tj
+<3834> Tj
ET
0.000 0.000 0.000 SCN
@@ -2489,7 +2489,7 @@ ET
BT
535.3009999999999 646.8359999999998 Td
/F1.0 10.5 Tf
-<3830> Tj
+<3836> Tj
ET
0.000 0.000 0.000 SCN
@@ -2540,7 +2540,7 @@ ET
BT
535.3009999999999 628.3559999999998 Td
/F1.0 10.5 Tf
-<3831> Tj
+<3837> Tj
ET
0.000 0.000 0.000 SCN
@@ -2591,7 +2591,7 @@ ET
BT
535.3009999999999 609.8759999999997 Td
/F1.0 10.5 Tf
-<3931> Tj
+<3937> Tj
ET
0.000 0.000 0.000 SCN
@@ -2622,16 +2622,16 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 591.3959999999997 Td
+159.30124999999992 591.3959999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-533.94125 591.3959999999997 Td
+528.07175 591.3959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2640,9 +2640,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 591.3959999999997 Td
+529.4314999999999 591.3959999999997 Td
/F1.0 10.5 Tf
-<3939> Tj
+<313035> Tj
ET
0.000 0.000 0.000 SCN
@@ -2693,7 +2693,7 @@ ET
BT
529.4314999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<313030> Tj
+<313036> Tj
ET
0.000 0.000 0.000 SCN
@@ -2744,7 +2744,7 @@ ET
BT
529.4314999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<313032> Tj
+<313038> Tj
ET
0.000 0.000 0.000 SCN
@@ -2784,7 +2784,7 @@ ET
BT
529.4314999999999 535.9559999999997 Td
/F1.0 10.5 Tf
-<313035> Tj
+<313131> Tj
ET
0.000 0.000 0.000 SCN
@@ -2835,7 +2835,7 @@ ET
BT
529.4314999999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<313036> Tj
+<313132> Tj
ET
0.000 0.000 0.000 SCN
@@ -2886,7 +2886,7 @@ ET
BT
529.4314999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<313038> Tj
+<313134> Tj
ET
0.000 0.000 0.000 SCN
@@ -2937,7 +2937,7 @@ ET
BT
529.4314999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<313039> Tj
+<313135> Tj
ET
0.000 0.000 0.000 SCN
@@ -2988,7 +2988,7 @@ ET
BT
529.4314999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313131> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3039,7 +3039,7 @@ ET
BT
529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313133> Tj
+<313139> Tj
ET
0.000 0.000 0.000 SCN
@@ -3090,7 +3090,7 @@ ET
BT
529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313134> Tj
+<313230> Tj
ET
0.000 0.000 0.000 SCN
@@ -3141,7 +3141,7 @@ ET
BT
529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313137> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3181,7 +3181,7 @@ ET
BT
529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313232> Tj
+<313238> Tj
ET
0.000 0.000 0.000 SCN
@@ -3232,7 +3232,7 @@ ET
BT
529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313233> Tj
+<313239> Tj
ET
0.000 0.000 0.000 SCN
@@ -3283,7 +3283,7 @@ ET
BT
529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313234> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3334,7 +3334,7 @@ ET
BT
529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313236> Tj
+<313332> Tj
ET
0.000 0.000 0.000 SCN
@@ -3385,7 +3385,7 @@ ET
BT
529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313237> Tj
+<313333> Tj
ET
0.000 0.000 0.000 SCN
@@ -3436,7 +3436,7 @@ ET
BT
529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313238> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -3476,7 +3476,7 @@ ET
BT
529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313330> Tj
+<313337> Tj
ET
0.000 0.000 0.000 SCN
@@ -3527,7 +3527,7 @@ ET
BT
529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313330> Tj
+<313337> Tj
ET
0.000 0.000 0.000 SCN
@@ -3578,7 +3578,7 @@ ET
BT
529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313331> Tj
+<313338> Tj
ET
0.000 0.000 0.000 SCN
@@ -3651,7 +3651,7 @@ ET
BT
529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313333> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
@@ -3691,7 +3691,7 @@ ET
BT
529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313335> Tj
+<313432> Tj
ET
0.000 0.000 0.000 SCN
@@ -3742,7 +3742,7 @@ ET
BT
529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313335> Tj
+<313432> Tj
ET
0.000 0.000 0.000 SCN
@@ -3826,7 +3826,7 @@ ET
BT
529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313430> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -3877,7 +3877,7 @@ ET
BT
529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313430> Tj
+<313438> Tj
ET
0.000 0.000 0.000 SCN
@@ -3928,7 +3928,7 @@ ET
BT
529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313433> Tj
+<313531> Tj
ET
0.000 0.000 0.000 SCN
@@ -3968,7 +3968,7 @@ ET
BT
529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313530> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -4019,7 +4019,7 @@ ET
BT
529.4314999999999 92.43599999999955 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313539> Tj
ET
0.000 0.000 0.000 SCN
@@ -4070,7 +4070,7 @@ ET
BT
529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313533> Tj
+<313631> Tj
ET
0.000 0.000 0.000 SCN
@@ -4154,7 +4154,7 @@ ET
BT
529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
-<313536> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -4174,7 +4174,7 @@ endobj
/F5.0 56 0 R
>>
>>
-/Annots [2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 R 2142 0 R 2143 0 R 2144 0 R 2145 0 R 2146 0 R 2147 0 R 2148 0 R 2149 0 R 2150 0 R 2151 0 R 2152 0 R 2153 0
R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 R 2173 0 R]
+/Annots [2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0 R 2184 0 R 2185 0 R 2186 0 R 2187 0 R 2188 0 R 2189 0 R 2190 0 R 2191 0 R 2192 0 R 2193 0 R 2194 0 R 2195 0 R 2196 0 R 2197 0 R 2198 0 R 2199 0 R 2200 0 R 2201 0 R 2202 0 R 2203 0 R 2204 0 R 2205 0 R 2206 0 R 2207 0 R 2208 0 R 2209 0 R 2210 0 R 2211 0 R 2212 0 R 2213 0 R 2214 0 R 2215 0 R 2216 0 R 2217 0 R 2218 0 R 2219 0 R 2220 0 R 2221 0 R 2222 0 R 2223 0 R 2224 0 R 2225 0 R 2226 0 R 2227 0 R 2228 0 R 2229 0 R 2230 0 R 2231 0 R 2232 0 R 2233 0 R 2234 0 R 2235 0 R 2236 0 R 2237 0 R 2238 0 R 2239 0 R 2240 0 R 2241 0 R 2242 0 R 2243 0 R 2244 0 R 2245 0 R 2246 0 R 2247 0 R 2248 0 R 2249 0 R 2250 0 R 2251 0 R 2252 0 R 2253 0 R 2254 0 R 2255 0 R 2256 0 R 2257 0 R 2258 0 R 2259 0 R 2260 0 R 2261 0 R 2262 0 R 2263 0 R 2264 0 R 2265 0 R 2266 0 R 2267 0 R 2268 0 R 2269 0 R 2270 0 R 2271 0 R 2272 0 R 2273 0 R 2274 0 R 2275 0 R 2276 0 R 2277 0 R 2278 0 R 2279 0 R 2280 0 R 2281 0 R 2282 0 R 2283 0 R 2284 0
R 2285 0 R 2286 0 R 2287 0 R 2288 0 R 2289 0 R 2290 0 R 2291 0 R 2292 0 R 2293 0 R 2294 0 R 2295 0 R 2296 0 R 2297 0 R 2298 0 R 2299 0 R 2300 0 R 2301 0 R 2302 0 R 2303 0 R 2304 0 R]
>>
endobj
13 0 obj
@@ -4230,7 +4230,7 @@ ET
BT
529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313538> Tj
+<313636> Tj
ET
0.000 0.000 0.000 SCN
@@ -4281,7 +4281,7 @@ ET
BT
529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313633> Tj
+<313731> Tj
ET
0.000 0.000 0.000 SCN
@@ -4321,7 +4321,7 @@ ET
BT
529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313636> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -4405,7 +4405,7 @@ ET
BT
529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313636> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -4489,7 +4489,7 @@ ET
BT
529.4315 720.7559999999999 Td
/F1.0 10.5 Tf
-<313636> Tj
+<313735> Tj
ET
0.000 0.000 0.000 SCN
@@ -4573,7 +4573,7 @@ ET
BT
529.4314999999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<313637> Tj
+<313737> Tj
ET
0.000 0.000 0.000 SCN
@@ -4613,7 +4613,7 @@ ET
BT
529.4314999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313739> Tj
ET
0.000 0.000 0.000 SCN
@@ -4664,7 +4664,7 @@ ET
BT
529.4314999999999 665.3159999999998 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313739> Tj
ET
0.000 0.000 0.000 SCN
@@ -4683,7 +4683,7 @@ endobj
/F3.0 41 0 R
>>
>>
-/Annots [2174 0 R 2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0 R 2184 0 R 2185 0 R 2186 0 R 2187 0 R 2188 0 R 2189 0 R 2190 0 R 2191 0 R 2192 0 R 2193 0 R 2194 0 R 2195 0 R 2196 0 R 2197 0 R 2198 0 R 2199 0 R 2200 0 R 2201 0 R 2202 0 R 2203 0 R 2204 0 R]
+/Annots [2305 0 R 2306 0 R 2307 0 R 2308 0 R 2309 0 R 2310 0 R 2311 0 R 2312 0 R 2313 0 R 2314 0 R 2315 0 R 2316 0 R 2317 0 R 2318 0 R 2319 0 R 2320 0 R 2321 0 R 2322 0 R 2323 0 R 2324 0 R 2325 0 R 2326 0 R 2327 0 R 2328 0 R 2329 0 R 2330 0 R 2331 0 R 2332 0 R 2333 0 R 2334 0 R 2335 0 R]
>>
endobj
15 0 obj
@@ -5238,7 +5238,7 @@ endobj
/Font << /F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [22 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]
@@ -5253,18 +5253,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [1549 0 R 1550 0 R]
+<< /Kids [1531 0 R 1532 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAABZ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2302 0 R
+/FontDescriptor 2433 0 R
/FirstChar 32
/LastChar 255
-/Widths 2304 0 R
-/ToUnicode 2303 0 R
+/Widths 2435 0 R
+/ToUnicode 2434 0 R
>>
endobj
21 0 obj
@@ -5806,7 +5806,7 @@ endobj
/F3.0 41 0 R
>>
/XObject << /I1 39 0 R
-/Stamp1 2205 0 R
+/Stamp1 2336 0 R
>>
>>
/Annots [40 0 R 42 0 R 43 0 R 44 0 R 45 0 R 46 0 R]
@@ -5947,11 +5947,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACA+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2306 0 R
+/FontDescriptor 2437 0 R
/FirstChar 32
/LastChar 255
-/Widths 2308 0 R
-/ToUnicode 2307 0 R
+/Widths 2439 0 R
+/ToUnicode 2438 0 R
>>
endobj
42 0 obj
@@ -7852,7 +7852,7 @@ endobj
/F3.1 52 0 R
/F5.0 56 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [53 0 R 54 0 R 55 0 R 57 0 R]
@@ -7868,22 +7868,22 @@ endobj
<< /Type /Font
/BaseFont /AAAACB+mplus1mn-bold
/Subtype /TrueType
-/FontDescriptor 2310 0 R
+/FontDescriptor 2441 0 R
/FirstChar 32
/LastChar 255
-/Widths 2312 0 R
-/ToUnicode 2311 0 R
+/Widths 2443 0 R
+/ToUnicode 2442 0 R
>>
endobj
52 0 obj
<< /Type /Font
/BaseFont /AAAACC+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2314 0 R
+/FontDescriptor 2445 0 R
/FirstChar 32
/LastChar 255
-/Widths 2316 0 R
-/ToUnicode 2315 0 R
+/Widths 2447 0 R
+/ToUnicode 2446 0 R
>>
endobj
53 0 obj
@@ -7914,11 +7914,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACD+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2318 0 R
+/FontDescriptor 2449 0 R
/FirstChar 32
/LastChar 255
-/Widths 2320 0 R
-/ToUnicode 2319 0 R
+/Widths 2451 0 R
+/ToUnicode 2450 0 R
>>
endobj
57 0 obj
@@ -8984,7 +8984,7 @@ endobj
/F3.1 52 0 R
/F4.0 51 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [61 0 R 63 0 R 64 0 R 65 0 R 66 0 R]
@@ -9008,11 +9008,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACE+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2322 0 R
+/FontDescriptor 2453 0 R
/FirstChar 32
/LastChar 255
-/Widths 2324 0 R
-/ToUnicode 2323 0 R
+/Widths 2455 0 R
+/ToUnicode 2454 0 R
>>
endobj
63 0 obj
@@ -10698,7 +10698,7 @@ endobj
/F7.0 69 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [71 0 R 72 0 R]
@@ -10708,11 +10708,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACF+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2326 0 R
+/FontDescriptor 2457 0 R
/FirstChar 32
/LastChar 255
-/Widths 2328 0 R
-/ToUnicode 2327 0 R
+/Widths 2459 0 R
+/ToUnicode 2458 0 R
>>
endobj
70 0 obj
@@ -12439,7 +12439,7 @@ endobj
/F3.0 41 0 R
/F5.0 56 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [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]
@@ -12806,7 +12806,7 @@ endobj
/Font << /F1.0 8 0 R
/F3.0 41 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
>>
@@ -14064,7 +14064,7 @@ endobj
/F7.0 69 0 R
/F3.0 41 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [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 124 0 R 125 0 R]
@@ -16291,7 +16291,7 @@ endobj
/F3.0 41 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [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 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R]
@@ -18431,7 +18431,7 @@ endobj
/F3.0 41 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2205 0 R
+/XObject << /Stamp1 2336 0 R
>>
>>
/Annots [163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R]
@@ -18700,7 +18700,7 @@ endobj
>>
endobj
195 0 obj
-<< /Length 24566
+<< /Length 19463
>>
stream
q
@@ -18802,13 +18802,109 @@ 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 750.366 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.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 750.366 Td
+/F3.0 10.5 Tf
+<6f2e612e692e632e6d2e73> 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
+123.99000000000001 750.366 Td
+/F1.0 10.5 Tf
+<20697320616e20616262726576696174696f6e20666f7220> 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
+237.76800000000003 750.366 Td
+/F3.0 10.5 Tf
+<6f72672e6170616368652e697369732e636f72652e6d6574616d6f64656c2e7365727669636573> 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 728.586 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.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 728.586 Td
+/F3.0 10.5 Tf
+<6f2e612e692e632e722e73> 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
+123.99000000000001 728.586 Td
+/F1.0 10.5 Tf
+<20697320616e20616262726576696174696f6e20666f7220> 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
+237.76800000000003 728.586 Td
+/F3.0 10.5 Tf
+<6f72672e6170616368652e697369732e636f72652e72756e74696d652e7365727669636573> 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.301 Tw
BT
-48.24000000000001 744.366 Td
+48.24000000000001 700.806 Td
/F1.0 10.5 Tf
[<54686572652061726520616c736f2061206e756d626572206f662070726573656e746174696f6e206c61> 20.01953125 <796572205350497320746861742075736520696e7465726e616c20636c61737365732e202054686573652063616e20626520666f756e6420696e>] TJ
ET
@@ -18821,7 +18917,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 728.586 Td
+48.24000000000001 685.0260000000001 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -18832,7 +18928,7 @@ ET
0.259 0.545 0.792 SCN
BT
-66.93 728.586 Td
+66.93 685.0260000000001 Td
/F1.0 10.5 Tf
<6e6578742063686170746572> Tj
ET
@@ -18843,7 +18939,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.22400000000002 728.586 Td
+130.22400000000002 685.0260000000001 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -18854,7 +18950,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 688.7460000000001 Td
+48.24000000000001 645.1860000000001 Td
/F2.0 18 Tf
<332e312e20> Tj
ET
@@ -18865,7 +18961,7 @@ ET
0.694 0.129 0.275 SCN
BT
-83.57400000000001 688.7460000000001 Td
+83.57400000000001 645.1860000000001 Td
/F3.0 18 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -18878,7 +18974,7 @@ ET
1.027 Tw
BT
-48.24000000000001 660.7260000000001 Td
+48.24000000000001 617.1660000000002 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -18893,7 +18989,7 @@ ET
1.027 Tw
BT
-70.687375 660.7260000000001 Td
+70.687375 617.1660000000002 Td
/F3.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -18908,7 +19004,7 @@ ET
1.027 Tw
BT
-180.937375 660.7260000000001 Td
+180.937375 617.1660000000002 Td
/F1.0 10.5 Tf
<20737570706f72747320746865202864656661756c7420696d706c656d656e746174696f6e206f66207468652920> Tj
ET
@@ -18923,7 +19019,7 @@ ET
1.027 Tw
BT
-415.78999999999996 660.7260000000001 Td
+415.78999999999996 617.1660000000002 Td
/F3.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -18938,7 +19034,7 @@ ET
1.027 Tw
BT
-547.04 660.7260000000001 Td
+547.04 617.1660000000002 Td
ET
@@ -18951,7 +19047,7 @@ ET
2.311 Tw
BT
-48.24000000000001 644.9460000000001 Td
+48.24000000000001 601.3860000000002 Td
/F1.0 10.5 Tf
<616c6c6f77696e672074686520> Tj
ET
@@ -18966,7 +19062,7 @@ ET
2.311 Tw
BT
-117.55176231971153 644.9460000000001 Td
+117.55176231971153 601.3860000000002 Td
/F1.0 10.5 Tf
<5265737466756c4f626a6563747320766965776572> Tj
ET
@@ -18981,7 +19077,7 @@ ET
2.311 Tw
BT
-228.5268934795673 644.9460000000001 Td
+228.5268934795673 601.3860000000002 Td
/F1.0 10.5 Tf
[<20746f20616c6c6f7720646f6d61696e206f626a6563747320746f206265207472> 20.01953125 <616e73666f726d656420696e746f20736f6d65206f74686572>] TJ
ET
@@ -18994,7 +19090,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 629.1660000000002 Td
+48.24000000000001 585.6060000000002 Td
/F1.0 10.5 Tf
[<666f726d6174206173207370656369666965642062> 20.01953125 <7920746865204854545020>] TJ
ET
@@ -19005,7 +19101,7 @@ ET
0.694 0.129 0.275 SCN
BT
-209.79279492187501 629.1660000000002 Td
+209.79279492187501 585.6060000000002 Td
/F3.0 10.5 Tf
<416363657074> Tj
ET
@@ -19016,7 +19112,7 @@ ET
0.200 0.200 0.200 SCN
BT
-241.29279492187501 629.1660000000002 Td
+241.29279492187501 585.6060000000002 Td
/F1.0 10.5 Tf
<206865616465722e> Tj
ET
@@ -19027,7 +19123,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 601.3860000000001 Td
+48.24000000000001 557.8260000000002 Td
/F1.0 10.5 Tf
<53656520> Tj
ET
@@ -19038,7 +19134,7 @@ ET
0.694 0.129 0.275 SCN
BT
-67.89600000000002 601.3860000000001 Td
+67.89600000000002 557.8260000000002 Td
/F3.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -19049,7 +19145,7 @@ ET
0.200 0.200 0.200 SCN
BT
-199.14600000000002 601.3860000000001 Td
+199.14600000000002 557.8260000000002 Td
/F1.0 10.5 Tf
<20666f7220667572746865722064697363757373696f6e2e> Tj
ET
@@ -19059,8 +19155,8 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 467.110 m
-113.807 585.570 l
+113.807 423.550 m
+113.807 542.010 l
S
Q
0.098 0.251 0.486 scn
@@ -19071,7 +19167,7 @@ Q
0.098 0.251 0.486 SCN
BT
-76.73933333333335 517.7600000000001 Td
+76.73933333333335 474.2000000000002 Td
/F6.1 24 Tf
<21> Tj
ET
@@ -19084,7 +19180,7 @@ ET
14.486 Tw
BT
-125.80666666666667 569.6060000000001 Td
+125.80666666666667 526.0460000000003 Td
/F1.0 10.5 Tf
[<556e6c696b> 20.01953125 <65206d6f7374206f7468657220646f6d61696e2073657276696365732c20746865206672> 20.01953125 <616d65776f726b2028746861742069732c>] TJ
ET
@@ -19099,7 +19195,7 @@ ET
9.537 Tw
BT
-125.80666666666667 553.8260000000001 Td
+125.80666666666667 510.2660000000002 Td
/F3.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -19114,7 +19210,7 @@ ET
9.537 Tw
BT
-257.0566666666667 553.8260000000001 Td
+257.0566666666667 510.2660000000002 Td
/F1.0 10.5 Tf
<292077696c6c20636865636b20> Tj
ET
@@ -19129,7 +19225,7 @@ ET
9.537 Tw
BT
-345.09708333333333 553.8260000000001 Td
+345.09708333333333 510.2660000000002 Td
/F7.0 10.5 Tf
<616c6c> Tj
ET
@@ -19144,7 +19240,7 @@ ET
9.537 Tw
BT
-357.5605833333333 553.8260000000001 Td
+357.5605833333333 510.2660000000002 Td
/F1.0 10.5 Tf
<20617661696c61626c6520696d706c656d656e746174696f6e73206f66> Tj
ET
@@ -19159,7 +19255,7 @@ ET
0.819 Tw
BT
-125.80666666666667 538.0460000000002 Td
+125.80666666666667 494.4860000000002 Td
/F3.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -19174,7 +19270,7 @@ ET
0.819 Tw
BT
-236.05666666666667 538.0460000000002 Td
+236.05666666666667 494.4860000000002 Td
/F1.0 10.5 Tf
<20746f20636f6e766572742074686520646f6d61696e206f626a65637420746f2074686520726571756573746564206d6564696120747970652c> Tj
ET
@@ -19189,7 +19285,7 @@ ET
1.996 Tw
BT
-125.80666666666667 522.2660000000002 Td
+125.80666666666667 478.70600000000024 Td
/F1.0 10.5 Tf
[<72> 20.01953125 <6174686572207468616e206d6572656c792074686520666972737420696d706c656d656e746174696f6e20666f756e643b20696e206f7468657220776f726473206974207573657320746865>] TJ
ET
@@ -19204,7 +19300,7 @@ ET
1.102 Tw
BT
-125.80666666666667 506.48600000000016 Td
+125.80666666666667 462.9260000000002 Td
/F1.0 10.5 Tf
[<636861696e2d6f662d726573706f6e736962696c697479207061747465726e2e202053657276696365732061726520636865636b> 20.01953125 <656420696e20746865206f72646572696e6720646566696e65642062> 20.01953125 <79>] TJ
ET
@@ -19219,7 +19315,7 @@ ET
0.791 Tw
BT
-125.80666666666667 490.70600000000013 Td
+125.80666666666667 447.1460000000002 Td
/F3.0 10.5 Tf
<40446f6d61696e536572766963654c61796f7574236d656e754f726465722829> Tj
ET
@@ -19234,7 +19330,7 @@ ET
0.791 Tw
BT
-293.8066666666667 490.70600000000013 Td
+293.8066666666667 447.1460000000002 Td
/F1.0 10.5 Tf
<292e20546865206d6170706564206f626a65637420757365642077696c6c20626520746865206669727374206e6f6e2d> Tj
ET
@@ -19247,7 +19343,7 @@ ET
0.694 0.129 0.275 SCN
BT
-125.80666666666667 474.92600000000016 Td
+125.80666666666667 431.3660000000002 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -19258,7 +19354,7 @@ ET
0.200 0.200 0.200 SCN
BT
-146.80666666666667 474.92600000000016 Td
+146.80666666666667 431.3660000000002 Td
/F1.0 10.5 Tf
[<20726573756c742072657475726e65642062> 20.01953125 <7920616e20696d706c656d656e746174696f6e2e>] TJ
ET
@@ -19269,7 +19365,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 436.4260000000001 Td
+48.24000000000001 392.86600000000016 Td
/F2.0 13 Tf
<332e312e312e20535049> Tj
ET
@@ -19280,7 +19376,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 409.8660000000001 Td
+48.24000000000001 366.30600000000015 Td
/F1.0 10.5 Tf
[<5468652053504920646566696e65642062> 20.01953125 <79207468697320736572766963652069733a>] TJ
ET
@@ -19289,28 +19385,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 394.050 m
-543.040 394.050 l
-545.249 394.050 547.040 392.259 547.040 390.050 c
-547.040 317.090 l
-547.040 314.881 545.249 313.090 543.040 313.090 c
-52.240 313.090 l
-50.031 313.090 48.240 314.881 48.240 317.090 c
-48.240 390.050 l
-48.240 392.259 50.031 394.050 52.240 394.050 c
+52.240 350.490 m
+543.040 350.490 l
+545.249 350.490 547.040 348.699 547.040 346.490 c
+547.040 273.530 l
+547.040 271.321 545.249 269.530 543.040 269.530 c
+52.240 269.530 l
+50.031 269.530 48.240 271.321 48.240 273.530 c
+48.240 346.490 l
+48.240 348.699 50.031 350.490 52.240 350.490 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 394.050 m
-543.040 394.050 l
-545.249 394.050 547.040 392.259 547.040 390.050 c
-547.040 317.090 l
-547.040 314.881 545.249 313.090 543.040 313.090 c
-52.240 313.090 l
-50.031 313.090 48.240 314.881 48.240 317.090 c
-48.240 390.050 l
-48.240 392.259 50.031 394.050 52.240 394.050 c
+52.240 350.490 m
+543.040 350.490 l
+545.249 350.490 547.040 348.699 547.040 346.490 c
+547.040 273.530 l
+547.040 271.321 545.249 269.530 543.040 269.530 c
+52.240 269.530 l
+50.031 269.530 48.240 271.321 48.240 273.530 c
+48.240 346.490 l
+48.240 348.699 50.031 350.490 52.240 350.490 c
h
S
Q
@@ -19318,7 +19414,7 @@ Q
0.000 0.533 0.000 SCN
BT
-59.24000000000001 371.2250000000001 Td
+59.24000000000001 327.66500000000013 Td
/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -19329,7 +19425,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 371.2250000000001 Td
+92.24000000000001 327.66500000000013 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19340,7 +19436,7 @@ ET
0.000 0.533 0.000 SCN
BT
-97.74000000000001 371.2250000000001 Td
+97.74000000000001 327.66500000000013 Td
/F4.0 11 Tf
<696e74657266616365> Tj
ET
@@ -19351,7 +19447,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 371.2250000000001 Td
+147.24 327.66500000000013 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19362,7 +19458,7 @@ ET
0.733 0.000 0.400 SCN
BT
-152.74 371.2250000000001 Td
+152.74 327.66500000000013 Td
/F4.0 11 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -19373,7 +19469,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 371.2250000000001 Td
+268.24 327.66500000000013 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19384,7 +19480,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 371.2250000000001 Td
+273.74 327.66500000000013 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -19395,7 +19491,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 356.48500000000007 Td
+59.24000000000001 312.9250000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19406,7 +19502,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 356.48500000000007 Td
+81.24000000000001 312.9250000000001 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -19417,7 +19513,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 356.48500000000007 Td
+114.24000000000001 312.9250000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19428,7 +19524,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 356.48500000000007 Td
+119.74000000000001 312.9250000000001 Td
/F3.0 11 Tf
<6d6170> Tj
ET
@@ -19439,7 +19535,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 356.48500000000007 Td
+136.24 312.9250000000001 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19450,7 +19546,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 356.48500000000007 Td
+141.74 312.9250000000001 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -19461,7 +19557,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 356.48500000000007 Td
+174.74 312.9250000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19472,7 +19568,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 356.48500000000007 Td
+180.24 312.9250000000001 Td
/F3.0 11 Tf
<6f626a656374> Tj
ET
@@ -19483,7 +19579,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 356.48500000000007 Td
+213.24 312.9250000000001 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -19494,7 +19590,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 356.48500000000007 Td
+218.74 312.9250000000001 Td
/F3.0 11 Tf
<202020202020202020202020202020202020202020202020202020> Tj
ET
@@ -19505,7 +19601,7 @@ ET
0.694 0.129 0.275 SCN
BT
-367.24 356.48500000000007 Td
+367.24 312.9250000000001 Td
/F3.1 11 Tf
<21> Tj
ET
@@ -19516,7 +19612,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 341.74500000000006 Td
+59.24000000000001 298.1850000000001 Td
/F3.0 11 Tf
<ca2020202020202020202020202020> Tj
ET
@@ -19527,7 +19623,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 341.74500000000006 Td
+141.74 298.1850000000001 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -19538,7 +19634,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 341.74500000000006 Td
+163.74 298.1850000000001 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19549,7 +19645,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 341.74500000000006 Td
+169.24 298.1850000000001 Td
/F3.0 11 Tf
<4d6564696154797065> Tj
ET
@@ -19560,7 +19656,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 341.74500000000006 Td
+218.74 298.1850000000001 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19571,7 +19667,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 341.74500000000006 Td
+224.24 298.1850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19582,7 +19678,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 341.74500000000006 Td
+229.74 298.1850000000001 Td
/F3.0 11 Tf
<61636365707461626c654d656469615479706573> Tj
ET
@@ -19593,7 +19689,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 341.74500000000006 Td
+339.74 298.1850000000001 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -19604,7 +19700,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 341.74500000000006 Td
+350.74 298.1850000000001 Td
/F3.0 11 Tf
<202020> Tj
ET
@@ -19615,7 +19711,7 @@ ET
0.694 0.129 0.275 SCN
BT
-367.24 341.74500000000006 Td
+367.24 298.1850000000001 Td
/F3.1 11 Tf
<22> Tj
ET
@@ -19626,7 +19722,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 327.00500000000005 Td
+59.24000000000001 283.4450000000001 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -19637,7 +19733,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.27450000000001 295.36500000000007 Td
+51.27450000000001 251.8050000000001 Td
/F3.1 10.5 Tf
<21> Tj
ET
@@ -19650,7 +19746,7 @@ ET
0.428 Tw
BT
-64.80900000000001 295.12600000000003 Td
+64.80900000000001 251.5660000000001 Td
/F1.0 10.5 Tf
<7479706963616c6c792074686520696e707574206973206120646f6d61696e206f626a656374202877686f736520737472756374757265206d69676874206368616e6765206f7665722074696d65292c20616e6420746865206f7574707574> Tj
ET
@@ -19663,7 +19759,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.80900000000001 279.346 Td
+64.80900000000001 235.7860000000001 Td
/F1.0 10.5 Tf
[<697320612044> 20.01953125 <54> 20.01953125 <4f202877686f7365207374727563747572652069732067756172> 20.01953125 <616e7465656420746f20626520707265736572766564206f7665722074696d6529>] TJ
ET
@@ -19674,7 +19770,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.27450000000001 257.80500000000006 Td
+51.27450000000001 214.2450000000001 Td
/F3.1 10.5 Tf
<22> Tj
ET
@@ -19685,7 +19781,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.80900000000001 257.56600000000003 Td
+64.80900000000001 214.00600000000009 Td
/F1.0 10.5 Tf
[<617320706572207468652063616c6c6572> -29.78515625 <d573204854545020>] TJ
ET
@@ -19696,7 +19792,7 @@ ET
0.694 0.129 0.275 SCN
BT
-185.336244140625 257.56600000000003 Td
+185.336244140625 214.00600000000009 Td
/F3.0 10.5 Tf
<416363657074> Tj
ET
@@ -19707,7 +19803,7 @@ ET
0.200 0.200 0.200 SCN
BT
-216.836244140625 257.56600000000003 Td
+216.836244140625 214.00600000000009 Td
/F1.0 10.5 Tf
<20686561646572> Tj
ET
@@ -19720,7 +19816,7 @@ ET
1.688 Tw
BT
-48.24000000000001 229.78600000000003 Td
+48.24000000000001 186.22600000000008 Td
/F1.0 10.5 Tf
<496e2076657273696f6e73207072696f7220746f20> Tj
ET
@@ -19735,7 +19831,7 @@ ET
1.688 Tw
BT
-154.28093333333334 229.78600000000003 Td
+154.28093333333334 186.22600000000008 Td
/F3.0 10.5 Tf
<76312e31322e30> Tj
ET
@@ -19750,7 +19846,7 @@ ET
1.688 Tw
BT
-191.03093333333334 229.78600000000003 Td
+191.03093333333334 186.22600000000008 Td
/F1.0 10.5 Tf
<2c207468697320696e74657266616365207265736964656420696e206120646966666572656e74207061636b6167652c20696e7465726e616c20746f2074686520> Tj
ET
@@ -19765,7 +19861,7 @@ ET
1.688 Tw
BT
-512.327 229.78600000000003 Td
+512.327 186.22600000000008 Td
/F1.0 10.5 Tf
<5265737466756c> Tj
ET
@@ -19778,7 +19874,7 @@ ET
0.259 0.545 0.792 SCN
BT
-48.24000000000001 214.00600000000003 Td
+48.24000000000001 170.44600000000008 Td
/F1.0 10.5 Tf
<4f626a65637473> Tj
ET
@@ -19789,7 +19885,7 @@ ET
0.200 0.200 0.200 SCN
BT
-84.822 214.00600000000003 Td
+84.822 170.44600000000008 Td
/F1.0 10.5 Tf
<207669657765722c20616e6420646566696e6564206120736c696768746c7920646966666572656e74207369676e61747572652074686174207573656420616e20696e7465726e616c20656e756d3a> Tj
ET
@@ -19797,37 +19893,158 @@ 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
+535.978 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+196 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 195 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F3.0 41 0 R
+/F2.0 20 0 R
+/F6.1 62 0 R
+/F7.0 69 0 R
+/F4.0 51 0 R
+/F3.1 52 0 R
+>>
+/XObject << /Stamp1 2336 0 R
+>>
+>>
+/Annots [197 0 R 199 0 R 200 0 R 201 0 R 202 0 R 204 0 R 205 0 R]
+>>
+endobj
+197 0 obj
+<< /Border [0 0 0]
+/Dest (_rgsvc_presentation-layer-internal-spi)
+/Subtype /Link
+/Rect [66.93 681.96 130.22400000000002 696.2400000000001]
+/Type /Annot
+>>
+endobj
+198 0 obj
+[196 0 R /XYZ 0 669.2100000000002 null]
+endobj
+199 0 obj
+<< /Border [0 0 0]
+/Dest (_rgsvc_spi_ContentNegotiationService)
+/Subtype /Link
+/Rect [415.78999999999996 615.6960000000001 547.04 626.1960000000001]
+/Type /Annot
+>>
+endobj
+200 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (ugvro.pdf)
+>>
+/Subtype /Link
+/Rect [117.55176231971153 598.3200000000002 228.5268934795673 612.6000000000003]
+/Type /Annot
+>>
+endobj
+201 0 obj
+<< /Border [0 0 0]
+/Dest (_rgsvc_spi_ContentNegotiationService)
+/Subtype /Link
+/Rect [67.89600000000002 556.3560000000002 199.14600000000002 566.8560000000002]
+/Type /Annot
+>>
+endobj
+202 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
+>>
+/Subtype /Link
+/Rect [125.80666666666667 445.67600000000016 293.8066666666667 456.17600000000016]
+/Type /Annot
+>>
+endobj
+203 0 obj
+[196 0 R /XYZ 0 411.5500000000002 null]
+endobj
+204 0 obj
+<< /Border [0 0 0]
+/Dest (ugvro.adoc)
+/Subtype /Link
+/Rect [512.327 183.16000000000008 547.04 197.44000000000008]
+/Type /Annot
+>>
+endobj
+205 0 obj
+<< /Border [0 0 0]
+/Dest (ugvro.adoc)
+/Subtype /Link
+/Rect [48.24000000000001 167.38000000000008 84.822 181.66000000000008]
+/Type /Annot
+>>
+endobj
+206 0 obj
+<< /Length 41315
+>>
+stream
+q
+q
+/DeviceRGB cs
0.961 0.961 0.961 scn
-52.240 198.190 m
-543.040 198.190 l
-545.249 198.190 547.040 196.399 547.040 194.190 c
-547.040 91.750 l
-547.040 89.541 545.249 87.750 543.040 87.750 c
-52.240 87.750 l
-50.031 87.750 48.240 89.541 48.240 91.750 c
-48.240 194.190 l
-48.240 196.399 50.031 198.190 52.240 198.190 c
+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 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
h
f
+/DeviceRGB CS
0.800 0.800 0.800 SCN
0.75 w
-52.240 198.190 m
-543.040 198.190 l
-545.249 198.190 547.040 196.399 547.040 194.190 c
-547.040 91.750 l
-547.040 89.541 545.249 87.750 543.040 87.750 c
-52.240 87.750 l
-50.031 87.750 48.240 89.541 48.240 91.750 c
-48.240 194.190 l
-48.240 196.399 50.031 198.190 52.240 198.190 c
+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 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
h
S
Q
+/DeviceRGB cs
0.000 0.533 0.000 scn
+/DeviceRGB CS
0.000 0.533 0.000 SCN
BT
-59.24000000000001 175.365 Td
+59.24 783.0649999999999 Td
/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -19838,7 +20055,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 175.365 Td
+92.24000000000001 783.0649999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19849,7 +20066,7 @@ ET
0.000 0.533 0.000 SCN
BT
-97.74000000000001 175.365 Td
+97.74000000000001 783.0649999999999 Td
/F4.0 11 Tf
<696e74657266616365> Tj
ET
@@ -19860,7 +20077,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 175.365 Td
+147.24 783.0649999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19871,7 +20088,7 @@ ET
0.733 0.000 0.400 SCN
BT
-152.74 175.365 Td
+152.74 783.0649999999999 Td
/F4.0 11 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -19882,7 +20099,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 175.365 Td
+268.24 783.0649999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19893,7 +20110,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 175.365 Td
+273.74 783.0649999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -19904,7 +20121,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 160.625 Td
+59.24 768.3249999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19915,7 +20132,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 160.625 Td
+81.24000000000001 768.3249999999999 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -19926,7 +20143,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 160.625 Td
+114.24000000000001 768.3249999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19937,7 +20154,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 160.625 Td
+119.74000000000001 768.3249999999999 Td
/F3.0 11 Tf
<6d6170> Tj
ET
@@ -19948,7 +20165,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 160.625 Td
+136.24 768.3249999999999 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19959,7 +20176,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 160.625 Td
+141.74 768.3249999999999 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -19970,7 +20187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 160.625 Td
+174.74 768.3249999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19981,7 +20198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 160.625 Td
+180.24 768.3249999999999 Td
/F3.0 11 Tf
<6f626a656374> Tj
ET
@@ -19992,7 +20209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 160.625 Td
+213.24 768.3249999999999 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -20003,7 +20220,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 145.88500000000002 Td
+59.24 753.585 Td
/F3.0 11 Tf
<ca2020202020202020202020202020> Tj
ET
@@ -20014,7 +20231,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 145.88500000000002 Td
+141.74 753.585 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -20025,7 +20242,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 145.88500000000002 Td
+163.74 753.585 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -20036,7 +20253,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 145.88500000000002 Td
+169.24 753.585 Td
/F3.0 11 Tf
<4d6564696154797065> Tj
ET
@@ -20047,7 +20264,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 145.88500000000002 Td
+218.74 753.585 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -20058,7 +20275,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 145.88500000000002 Td
+224.24 753.585 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20069,7 +20286,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 145.88500000000002 Td
+229.74 753.585 Td
/F3.0 11 Tf
<61636365707461626c654d656469615479706573> Tj
ET
@@ -20080,7 +20297,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 145.88500000000002 Td
+339.74 753.585 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -20091,7 +20308,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 131.145 Td
+59.24 738.845 Td
/F3.0 11 Tf
<ca2020202020202020202020202020> Tj
ET
@@ -20102,7 +20319,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 131.145 Td
+141.74 738.845 Td
/F3.0 11 Tf
<526570726573656e746174696f6e54797065> Tj
ET
@@ -20113,7 +20330,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 131.145 Td
+240.74 738.845 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20124,7 +20341,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 131.145 Td
+246.24 738.845 Td
/F3.0 11 Tf
<726570726573656e746174696f6e54797065> Tj
ET
@@ -20135,7 +20352,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 131.145 Td
+345.24 738.845 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -20146,7 +20363,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 131.145 Td
+356.24 738.845 Td
/F3.0 11 Tf
<202020> Tj
ET
@@ -20157,7 +20374,7 @@ ET
0.694 0.129 0.275 SCN
BT
-372.74 131.145 Td
+372.74 738.845 Td
/F3.1 11 Tf
<21> Tj
ET
@@ -20168,7 +20385,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 101.66500000000002 Td
+59.24 709.365 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -20179,7 +20396,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.27450000000001 70.02500000000002 Td
+51.2745 677.7249999999999 Td
/F3.1 10.5 Tf
<21> Tj
ET
@@ -20192,7 +20409,7 @@ ET
2.132 Tw
BT
-64.80900000000001 69.78600000000002 Td
+64.809 677.4859999999999 Td
/F1.0 10.5 Tf
[<656e756d20726570726573656e74696e67207468652072657175657374656420726570726573656e746174696f6e3b206f6e6c7920657665722074616b> 20.01953125 <6520612076616c7565206f6620>] TJ
ET
@@ -20207,7 +20424,7 @@ ET
2.132 Tw
BT
-462.93431624348955 69.78600000000002 Td
+462.93431624348955 677.4859999999999 Td
/F3.0 10.5 Tf
<444f4d41494e5f4f424a454354> Tj
ET
@@ -20222,7 +20439,7 @@ ET
2.132 Tw
BT
-531.1843162434895 69.78600000000002 Td
+531.1843162434895 677.4859999999999 Td
/F1.0 10.5 Tf
<206f72> Tj
ET
@@ -20235,7 +20452,7 @@ ET
0.694 0.129 0.275 SCN
BT
-64.80900000000001 54.006000000000014 Td
+64.809 661.7059999999999 Td
/F3.0 10.5 Tf
<414354494f4e5f524553554c54> Tj
ET
@@ -20246,137 +20463,18 @@ ET
0.200 0.200 0.200 SCN
BT
-133.05900000000003 54.006000000000014 Td
+133.059 661.7059999999999 Td
/F1.0 10.5 Tf
<2e> 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
-535.978 14.388 Td
-/F1.0 9 Tf
-<3131> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-196 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 195 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F3.0 41 0 R
-/F2.0 20 0 R
-/F6.1 62 0 R
-/F7.0 69 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
->>
-/XObject << /Stamp1 2205 0 R
->>
->>
-/Annots [197 0 R 199 0 R 200 0 R 201 0 R 202 0 R 204 0 R 205 0 R]
->>
-endobj
-197 0 obj
-<< /Border [0 0 0]
-/Dest (_rgsvc_presentation-layer-internal-spi)
-/Subtype /Link
-/Rect [66.93 725.52 130.22400000000002 739.8000000000001]
-/Type /Annot
->>
-endobj
-198 0 obj
-[196 0 R /XYZ 0 712.7700000000001 null]
-endobj
-199 0 obj
-<< /Border [0 0 0]
-/Dest (_rgsvc_spi_ContentNegotiationService)
-/Subtype /Link
-/Rect [415.78999999999996 659.2560000000001 547.04 669.7560000000001]
-/Type /Annot
->>
-endobj
-200 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (ugvro.pdf)
->>
-/Subtype /Link
-/Rect [117.55176231971153 641.8800000000001 228.5268934795673 656.1600000000002]
-/Type /Annot
->>
-endobj
-201 0 obj
-<< /Border [0 0 0]
-/Dest (_rgsvc_spi_ContentNegotiationService)
-/Subtype /Link
-/Rect [67.89600000000002 599.916 199.14600000000002 610.416]
-/Type /Annot
->>
-endobj
-202 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
->>
-/Subtype /Link
-/Rect [125.80666666666667 489.2360000000001 293.8066666666667 499.7360000000001]
-/Type /Annot
->>
-endobj
-203 0 obj
-[196 0 R /XYZ 0 455.1100000000001 null]
-endobj
-204 0 obj
-<< /Border [0 0 0]
-/Dest (ugvro.adoc)
-/Subtype /Link
-/Rect [512.327 226.72000000000003 547.04 241.00000000000003]
-/Type /Annot
->>
-endobj
-205 0 obj
-<< /Border [0 0 0]
-/Dest (ugvro.adoc)
-/Subtype /Link
-/Rect [48.24000000000001 210.94000000000003 84.822 225.22000000000003]
-/Type /Annot
->>
-endobj
-206 0 obj
-<< /Length 38646
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.239999999999995 792.006 Td
+48.239999999999995 627.206 Td
/F2.0 13 Tf
<332e312e322e20496d706c656d656e746174696f6e73> Tj
ET
@@ -20387,7 +20485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 765.446 Td
+48.239999999999995 600.6460000000001 Td
/F1.0 10.5 Tf
[<4e6f2064656661756c7420696d706c656d656e746174696f6e73206172652070726f76696465642062> 20.01953125 <79204170616368652049736973206672> 20.01953125 <616d65776f726b20697473656c662e>] TJ
ET
@@ -20400,7 +20498,7 @@ ET
2.681 Tw
BT
-48.239999999999995 737.666 Td
+48.239999999999995 572.8660000000001 Td
/F1.0 10.5 Tf
<486f77657665722c2074686520286e6f6e2d4153462920> Tj
ET
@@ -20415,7 +20513,7 @@ ET
2.681 Tw
BT
-178.124375 737.666 Td
+178.124375 572.8660000000001 Td
/F1.0 10.5 Tf
<49736973206164646f6e732720746f646f617070> Tj
ET
@@ -20430,7 +20528,7 @@ ET
2.681 Tw
BT
-285.2729583333333 737.666 Td
+285.2729583333333 572.8660000000001 Td
/F1.0 10.5 Tf
<20696e636c7564657320612073616d706c6520696d706c656d656e746174696f6e20746f20636f6e7665727420697473> Tj
ET
@@ -20443,7 +20541,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.239999999999995 721.8860000000001 Td
+48.239999999999995 557.0860000000001 Td
/F3.0 10.5 Tf
<546f446f4974656d> Tj
ET
@@ -20454,7 +20552,7 @@ ET
0.200 0.200 0.200 SCN
BT
-90.24 721.8860000000001 Td
+90.24 557.0860000000001 Td
/F1.0 10.5 Tf
<20656e7469747920696e746f206120284a41584220616e6e6f74617465642920> Tj
ET
@@ -20465,7 +20563,7 @@ ET
0.694 0.129 0.275 SCN
BT
-244.4325 721.8860000000001 Td
+244.4325 557.0860000000001 Td
/F3.0 10.5 Tf
<546f446f4974656d44746f> Tj
ET
@@ -20476,7 +20574,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.1825 721.8860000000001 Td
+302.1825 557.0860000000001 Td
/F1.0 10.5 Tf
<2e202054686520736f7572636520636f64652069733a> Tj
ET
@@ -20485,28 +20583,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 706.070 m
-543.040 706.070 l
-545.249 706.070 547.040 704.279 547.040 702.070 c
-547.040 290.090 l
-547.040 287.881 545.249 286.090 543.040 286.090 c
-52.240 286.090 l
-50.031 286.090 48.240 287.881 48.240 290.090 c
-48.240 702.070 l
-48.240 704.279 50.031 706.070 52.240 706.070 c
+52.240 541.270 m
+543.040 541.270 l
+545.249 541.270 547.040 539.479 547.040 537.270 c
+547.040 125.290 l
+547.040 123.081 545.249 121.290 543.040 121.290 c
+52.240 121.290 l
+50.031 121.290 48.240 123.081 48.240 125.290 c
+48.240 537.270 l
+48.240 539.479 50.031 541.270 52.240 541.270 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 706.070 m
-543.040 706.070 l
-545.249 706.070 547.040 704.279 547.040 702.070 c
-547.040 290.090 l
-547.040 287.881 545.249 286.090 543.040 286.090 c
-52.240 286.090 l
-50.031 286.090 48.240 287.881 48.240 290.090 c
-48.240 702.070 l
-48.240 704.279 50.031 706.070 52.240 706.070 c
+52.240 541.270 m
+543.040 541.270 l
+545.249 541.270 547.040 539.479 547.040 537.270 c
+547.040 125.290 l
+547.040 123.081 545.249 121.290 543.040 121.290 c
+52.240 121.290 l
+50.031 121.290 48.240 123.081 48.240 125.290 c
+48.240 537.270 l
+48.240 539.479 50.031 541.270 52.240 541.270 c
h
S
Q
@@ -20514,7 +20612,7 @@ Q
0.333 0.333 0.333 SCN
BT
-59.239999999999995 683.2450000000001 Td
+59.239999999999995 518.4450000000002 Td
/F3.0 11 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -20525,7 +20623,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 683.2450000000001 Td
+136.24 518.4450000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -20536,7 +20634,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 683.2450000000001 Td
+141.74 518.4450000000002 Td
/F3.0 11 Tf
<6e6174757265> Tj
ET
@@ -20547,7 +20645,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 683.2450000000001 Td
+174.74 518.4450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20558,7 +20656,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 683.2450000000001 Td
+180.24 518.4450000000002 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20569,7 +20667,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 683.2450000000001 Td
+185.74 518.4450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20580,7 +20678,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 683.2450000000001 Td
+191.24 518.4450000000002 Td
/F3.0 11 Tf
<4e61747572654f6653657276696365> Tj
ET
@@ -20591,7 +20689,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 683.2450000000001 Td
+273.74 518.4450000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -20602,7 +20700,7 @@ ET
0.200 0.400 0.600 SCN
BT
-279.24 683.2450000000001 Td
+279.24 518.4450000000002 Td
/F3.0 11 Tf
<444f4d41494e> Tj
ET
@@ -20613,7 +20711,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 683.2450000000001 Td
+312.24 518.4450000000002 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -20624,7 +20722,7 @@ ET
0.000 0.533 0.000 SCN
BT
-59.239999999999995 668.5050000000001 Td
+59.239999999999995 503.7050000000002 Td
/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -20635,7 +20733,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24 668.5050000000001 Td
+92.24 503.7050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20646,7 +20744,7 @@ ET
0.000 0.533 0.000 SCN
BT
-97.74 668.5050000000001 Td
+97.74 503.7050000000002 Td
/F4.0 11 Tf
<636c617373> Tj
ET
@@ -20657,7 +20755,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24 668.5050000000001 Td
+125.24 503.7050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20668,7 +20766,7 @@ ET
0.733 0.000 0.400 SCN
BT
-130.74 668.5050000000001 Td
+130.74 503.7050000000002 Td
/F4.0 11 Tf
<436f6e74656e744d617070696e6753657276696365466f72546f446f4974656d> Tj
ET
@@ -20679,7 +20777,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 668.5050000000001 Td
+306.74 503.7050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20690,7 +20788,7 @@ ET
0.000 0.533 0.000 SCN
BT
-312.24 668.5050000000001 Td
+312.24 503.7050000000002 Td
/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -20701,7 +20799,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 668.5050000000001 Td
+367.24 503.7050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20712,7 +20810,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 668.5050000000001 Td
+372.74 503.7050000000002 Td
/F3.0 11 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -20723,7 +20821,7 @@ ET
0.200 0.200 0.200 SCN
BT
-488.24 668.5050000000001 Td
+488.24 503.7050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20734,7 +20832,7 @@ ET
0.200 0.200 0.200 SCN
BT
-493.74 668.5050000000001 Td
+493.74 503.7050000000002 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -20745,7 +20843,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 653.7650000000001 Td
+59.239999999999995 488.9650000000002 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20756,7 +20854,7 @@ ET
0.333 0.333 0.333 SCN
BT
-81.24 653.7650000000001 Td
+81.24 488.9650000000002 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -20767,7 +20865,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 639.0250000000002 Td
+59.239999999999995 474.2250000000002 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20778,7 +20876,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24 639.0250000000002 Td
+81.24 474.2250000000002 Td
/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -20789,7 +20887,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24 639.0250000000002 Td
+114.24 474.2250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20800,7 +20898,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74 639.0250000000002 Td
+119.74 474.2250000000002 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -20811,7 +20909,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 639.0250000000002 Td
+152.74 474.2250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20822,7 +20920,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 639.0250000000002 Td
+158.24 474.2250000000002 Td
/F3.0 11 Tf
<6d6170> Tj
ET
@@ -20833,7 +20931,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 639.0250000000002 Td
+174.74 474.2250000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -20844,7 +20942,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 624.2850000000002 Td
+59.239999999999995 459.4850000000002 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -20855,7 +20953,7 @@ ET
0.000 0.533 0.000 SCN
BT
-125.24 624.2850000000002 Td
+125.24 459.4850000000002 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -20866,7 +20964,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 624.2850000000002 Td
+152.74 459.4850000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20877,7 +20975,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 624.2850000000002 Td
+158.24 459.4850000000002 Td
/F3.0 11 Tf
<4f626a656374> Tj
ET
@@ -20888,7 +20986,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 624.2850000000002 Td
+191.24 459.4850000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20899,7 +20997,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 624.2850000000002 Td
+196.74 459.4850000000002 Td
/F3.0 11 Tf
<6f626a656374> Tj
ET
@@ -20910,7 +21008,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 624.2850000000002 Td
+229.74 459.4850000000002 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -20921,7 +21019,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 609.5450000000002 Td
+59.239999999999995 444.74500000000023 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -20932,7 +21030,7 @@ ET
0.000 0.533 0.000 SCN
BT
-125.24 609.5450000000002 Td
+125.24 444.74500000000023 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -20943,7 +21041,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 609.5450000000002 Td
+152.74 444.74500000000023 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20954,7 +21052,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 609.5450000000002 Td
+158.24 444.74500000000023 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -20965,7 +21063,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 609.5450000000002 Td
+180.24 444.74500000000023 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -20976,7 +21074,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 609.5450000000002 Td
+185.74 444.74500000000023 Td
/F3.0 11 Tf
<4d6564696154797065> Tj
ET
@@ -20987,7 +21085,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 609.5450000000002 Td
+235.24 444.74500000000023 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -20998,7 +21096,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 609.5450000000002 Td
+240.74 444.74500000000023 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21009,7 +21107,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 609.5450000000002 Td
+246.24 444.74500000000023 Td
/F3.0 11 Tf
<61636365707461626c654d656469615479706573> Tj
ET
@@ -21020,7 +21118,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 609.5450000000002 Td
+356.24 444.74500000000023 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -21031,7 +21129,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 609.5450000000002 Td
+361.74 444.74500000000023 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21042,7 +21140,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 609.5450000000002 Td
+367.24 444.74500000000023 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -21053,7 +21151,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 594.8050000000002 Td
+59.239999999999995 430.0050000000002 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -21064,7 +21162,7 @@ ET
0.000 0.533 0.000 SCN
BT
-103.24 594.8050000000002 Td
+103.24 430.0050000000002 Td
/F4.0 11 Tf
<6966> Tj
ET
@@ -21075,7 +21173,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24 594.8050000000002 Td
+114.24 430.0050000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -21086,7 +21184,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74 594.8050000000002 Td
+119.74 430.0050000000002 Td
/F3.0 11 Tf
<6f626a656374> Tj
ET
@@ -21097,7 +21195,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 594.8050000000002 Td
+152.74 430.0050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21108,7 +21206,7 @@ ET
0.000 0.533 0.000 SCN
BT
-158.24 594.8050000000002 Td
+158.24 430.0050000000002 Td
/F4.0 11 Tf
<696e7374616e63656f66> Tj
ET
@@ -21119,7 +21217,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 594.8050000000002 Td
+213.24 430.0050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21130,7 +21228,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 594.8050000000002 Td
+218.74 430.0050000000002 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -21141,7 +21239,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 594.8050000000002 Td
+262.74 430.0050000000002 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -21152,7 +21250,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 594.8050000000002 Td
+268.24 430.0050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21163,7 +21261,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 594.8050000000002 Td
+273.74 430.0050000000002 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -21174,7 +21272,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 580.0650000000002 Td
+59.239999999999995 415.2650000000002 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -21185,7 +21283,7 @@ ET
0.000 0.533 0.000 SCN
BT
-125.24 580.0650000000002 Td
+125.24 415.2650000000002 Td
/F4.0 11 Tf
<666f72> Tj
ET
@@ -21196,7 +21294,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 580.0650000000002 Td
+141.74 415.2650000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21207,7 +21305,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 580.0650000000002 Td
+147.24 415.2650000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -21218,7 +21316,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 580.0650000000002 Td
+152.74 415.2650000000002 Td
/F3.0 11 Tf
<4d6564696154797065> Tj
ET
@@ -21229,7 +21327,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 580.0650000000002 Td
+202.24 415.2650000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21240,7 +21338,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 580.0650000000002 Td
+207.74 415.2650000000002 Td
/F3.0 11 Tf
<61636365707461626c654d6564696154797065> Tj
ET
@@ -21251,7 +21349,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 580.0650000000002 Td
+312.24 415.2650000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21262,7 +21360,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 580.0650000000002 Td
+317.74 415.2650000000002 Td
/F3.0 11 Tf
<3a> Tj
ET
@@ -21273,7 +21371,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 580.0650000000002 Td
+323.24 415.2650000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21284,7 +21382,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 580.0650000000002 Td
+328.74 415.2650000000002 Td
/F3.0 11 Tf
<61636365707461626c654d656469615479706573> Tj
ET
@@ -21295,7 +21393,7 @@ ET
0.200 0.200 0.200 SCN
BT
-438.74 580.0650000000002 Td
+438.74 415.2650000000002 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -21306,7 +21404,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 580.0650000000002 Td
+444.24 415.2650000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21317,7 +21415,7 @@ ET
0.200 0.200 0.200 SCN
BT
-449.74 580.0650000000002 Td
+449.74 415.2650000000002 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -21328,7 +21426,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 565.3250000000002 Td
+59.239999999999995 400.5250000000002 Td
/F3.0 11 Tf
<ca202020202020202020202020202020> Tj
ET
@@ -21339,7 +21437,7 @@ ET
0.000 0.533 0.000 SCN
BT
-147.24 565.3250000000002 Td
+147.24 400.5250000000002 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -21350,7 +21448,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 565.3250000000002 Td
+174.74 400.5250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21361,7 +21459,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 565.3250000000002 Td
+180.24 400.5250000000002 Td
/F3.0 11 Tf
<4d6170> Tj
ET
@@ -21372,7 +21470,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 565.3250000000002 Td
+196.74 400.5250000000002 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -21383,7 +21481,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 565.3250000000002 Td
+202.24 400.5250000000002 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -21394,7 +21492,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 565.3250000000002 Td
+235.24 400.5250000000002 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -21405,7 +21503,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 565.3250000000002 Td
+240.74 400.5250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21416,7 +21514,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 565.3250000000002 Td
+246.24 400.5250000000002 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -21427,7 +21525,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 565.3250000000002 Td
+279.24 400.5250000000002 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -21438,7 +21536,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 565.3250000000002 Td
+284.74 400.5250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21449,7 +21547,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 565.3250000000002 Td
+290.24 400.5250000000002 Td
/F3.0 11 Tf
<706172616d6574657273> Tj
ET
@@ -21460,7 +21558,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 565.3250000000002 Td
+345.24 400.5250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21471,7 +21569,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 565.3250000000002 Td
+350.74 400.5250000000002 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -21482,7 +21580,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 565.3250000000002 Td
+356.24 400.5250000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21493,7 +21591,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 565.3250000000002 Td
+361.74 400.5250000000002 Td
/F3.0 11 Tf
<61636365707461626c654d6564696154797065> Tj
ET
@@ -21504,7 +21602,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 550.5850000000002 Td
+59.239999999999995 385.7850000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -21515,7 +21613,7 @@ ET
0.200 0.400 0.600 SCN
BT
-64.74 550.5850000000002 Td
+64.74 385.7850000000002 Td
/F3.0 11 Tf
<676574506172616d6574657273> Tj
ET
@@ -21526,7 +21624,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 550.5850000000002 Td
+136.24 385.7850000000002 Td
/F3.0 11 Tf
<28293b> Tj
ET
@@ -21537,7 +21635,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 535.8450000000001 Td
+59.239999999999995 371.0450000000002 Td
/F3.0 11 Tf
<ca202020202020202020202020202020> Tj
ET
@@ -21548,7 +21646,7 @@ ET
0.000 0.533 0.000 SCN
BT
-147.24 535.8450000000001 Td
+147.24 371.0450000000002 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -21559,7 +21657,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 535.8450000000001 Td
+174.74 371.0450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21570,7 +21668,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 535.8450000000001 Td
+180.24 371.0450000000002 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -21581,7 +21679,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 535.8450000000001 Td
+213.24 371.0450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21592,7 +21690,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 535.8450000000001 Td
+218.74 371.0450000000002 Td
/F3.0 11 Tf
<636c6173734e616d65> Tj
ET
@@ -21603,7 +21701,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 535.8450000000001 Td
+268.24 371.0450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21614,7 +21712,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 535.8450000000001 Td
+273.74 371.0450000000002 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -21625,7 +21723,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 535.8450000000001 Td
+279.24 371.0450000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21636,7 +21734,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 535.8450000000001 Td
+284.74 371.0450000000002 Td
/F3.0 11 Tf
<706172616d6574657273> Tj
ET
@@ -21647,7 +21745,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 535.8450000000001 Td
+339.74 371.0450000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -21658,7 +21756,7 @@ ET
0.200 0.400 0.600 SCN
BT
-345.24 535.8450000000001 Td
+345.24 371.0450000000002 Td
/F3.0 11 Tf
<676574> Tj
ET
@@ -21669,7 +21767,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 535.8450000000001 Td
+361.74 371.0450000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -21680,7 +21778,7 @@ ET
0.867 0.133 0.000 SCN
BT
-367.24 535.8450000000001 Td
+367.24 371.0450000000002 Td
/F3.0 11 Tf
<22782d726f2d646f6d61696e2d7479706522> Tj
ET
@@ -21691,7 +21789,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.24 535.8450000000001 Td
+466.24 371.0450000000002 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -21702,7 +21800,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 521.1050000000001 Td
+59.239999999999995 356.3050000000002 Td
/F3.0 11 Tf
<ca202020202020202020202020202020> Tj
ET
@@ -21713,7 +21811,7 @@ ET
0.000 0.533 0.000 SCN
BT
-147.24 521.1050000000001 Td
+147.24 356.3050000000002 Td
/F4.0 11 Tf
<6966> Tj
ET
@@ -21724,7 +21822,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 521.1050000000001 Td
+158.24 356.3050000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -21735,7 +21833,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 521.1050000000001 Td
+163.74 356.3050000000002 Td
/F3.0 11 Tf
<636c6173734e616d65> Tj
ET
@@ -21746,7 +21844,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 521.1050000000001 Td
+213.24 356.3050000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -21757,7 +21855,7 @@ ET
0.200 0.400 0.600 SCN
BT
-218.74 521.1050000000001 Td
+218.74 356.3050000000002 Td
/F3.0 11 Tf
<65716175736c> Tj
ET
@@ -21768,7 +21866,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 521.1050000000001 Td
+251.74 356.3050000000002 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -21779,7 +21877,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 521.1050000000001 Td
+257.24 356.3050000000002 Td
/F3.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -21790,7 +21888,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 521.1050000000001 Td
+323.24 356.3050000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -21801,7 +21899,7 @@ ET
0.200 0.400 0.600 SCN
BT
-328.74 521.1050000000001 Td
+328.74 356.3050000000002 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -21812,7 +21910,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 521.1050000000001 Td
+356.24 356.3050000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -21823,7 +21921,7 @@ ET
0.200 0.400 0.600 SCN
BT
-361.74 521.1050000000001 Td
+361.74 356.3050000000002 Td
/F3.0 11 Tf
<6765744e616d65> Tj
ET
@@ -21834,7 +21932,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 521.1050000000001 Td
+400.24 356.3050000000002 Td
/F3.0 11 Tf
<28292929> Tj
ET
@@ -21845,7 +21943,7 @@ ET
0.200 0.200 0.200 SCN
BT
-422.24 521.1050000000001 Td
+422.24 356.3050000000002 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21856,7 +21954,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 521.1050000000001 Td
+427.74 356.3050000000002 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -21867,7 +21965,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 506.3650000000001 Td
+59.239999999999995 341.56500000000017 Td
/F3.0 11 Tf
<ca20202020202020202020202020202020202020> Tj
ET
@@ -21878,7 +21976,7 @@ ET
0.000 0.533 0.000 SCN
BT
-169.24 506.3650000000001 Td
+169.24 341.56500000000017 Td
/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -21889,7 +21987,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 506.3650000000001 Td
+202.24 341.56500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21900,7 +21998,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 506.3650000000001 Td
+207.74 341.56500000000017 Td
/F3.0 11 Tf
<6e6577546f446f4974656d56315f31> Tj
ET
@@ -21911,7 +22009,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 506.3650000000001 Td
+290.24 341.56500000000017 Td
/F3.0 11 Tf
<2828> Tj
ET
@@ -21922,7 +22020,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 506.3650000000001 Td
+301.24 341.56500000000017 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -21933,7 +22031,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 506.3650000000001 Td
+345.24 341.56500000000017 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -21944,7 +22042,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 506.3650000000001 Td
+350.74 341.56500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -21955,7 +22053,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 506.3650000000001 Td
+356.24 341.56500000000017 Td
/F3.0 11 Tf
<6f626a656374> Tj
ET
@@ -21966,7 +22064,7 @@ ET
0.200 0.200 0.200 SCN
BT
-389.24 506.3650000000001 Td
+389.24 341.56500000000017 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -21977,7 +22075,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 491.6250000000001 Td
+59.239999999999995 326.82500000000016 Td
/F3.0 11 Tf
<ca202020202020202020202020202020> Tj
ET
@@ -21988,7 +22086,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 491.6250000000001 Td
+147.24 326.82500000000016 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -21999,7 +22097,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 476.8850000000001 Td
+59.239999999999995 312.08500000000015 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -22010,7 +22108,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24 476.8850000000001 Td
+125.24 312.08500000000015 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -22021,7 +22119,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 462.1450000000001 Td
+59.239999999999995 297.34500000000014 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22032,7 +22130,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24 462.1450000000001 Td
+103.24 297.34500000000014 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -22043,7 +22141,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 447.4050000000001 Td
+59.239999999999995 282.60500000000013 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22054,7 +22152,7 @@ ET
0.000 0.533 0.000 SCN
BT
-103.24 447.4050000000001 Td
+103.24 282.60500000000013 Td
/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -22065,7 +22163,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 447.4050000000001 Td
+136.24 282.60500000000013 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22076,7 +22174,7 @@ ET
0.000 0.533 0.000 SCN
BT
-141.74 447.4050000000001 Td
+141.74 282.60500000000013 Td
/F4.0 11 Tf
<6e756c6c> Tj
ET
@@ -22087,7 +22185,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 447.4050000000001 Td
+163.74 282.60500000000013 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -22098,7 +22196,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 432.66500000000013 Td
+59.239999999999995 267.8650000000002 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -22109,7 +22207,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24 432.66500000000013 Td
+81.24 267.8650000000002 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -22120,7 +22218,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 417.9250000000001 Td
+59.239999999999995 253.12500000000017 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -22131,7 +22229,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24 417.9250000000001 Td
+81.24 253.12500000000017 Td
/F4.0 11 Tf
<70726976617465> Tj
ET
@@ -22142,7 +22240,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74 417.9250000000001 Td
+119.74 253.12500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22153,7 +22251,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24 417.9250000000001 Td
+125.24 253.12500000000017 Td
/F3.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -22164,7 +22262,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 417.9250000000001 Td
+191.24 253.12500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22175,7 +22273,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 417.9250000000001 Td
+196.74 253.12500000000017 Td
/F3.0 11 Tf
<6e6577546f446f4974656d56315f31> Tj
ET
@@ -22186,7 +22284,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 417.9250000000001 Td
+279.24 253.12500000000017 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -22197,7 +22295,7 @@ ET
0.000 0.533 0.000 SCN
BT
-284.74 417.9250000000001 Td
+284.74 253.12500000000017 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -22208,7 +22306,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 417.9250000000001 Td
+312.24 253.12500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22219,7 +22317,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 417.9250000000001 Td
+317.74 253.12500000000017 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -22230,7 +22328,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 417.9250000000001 Td
+361.74 253.12500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22241,7 +22339,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 417.9250000000001 Td
+367.24 253.12500000000017 Td
/F3.0 11 Tf
<746f446f4974656d> Tj
ET
@@ -22252,7 +22350,7 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 417.9250000000001 Td
+411.24 253.12500000000017 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -22263,7 +22361,7 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 417.9250000000001 Td
+416.74 253.12500000000017 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22274,7 +22372,7 @@ ET
0.200 0.200 0.200 SCN
BT
-422.24 417.9250000000001 Td
+422.24 253.12500000000017 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -22285,7 +22383,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 403.1850000000001 Td
+59.239999999999995 238.38500000000016 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22296,7 +22394,7 @@ ET
0.000 0.533 0.000 SCN
BT
-103.24 403.1850000000001 Td
+103.24 238.38500000000016 Td
/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -22307,7 +22405,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 403.1850000000001 Td
+130.74 238.38500000000016 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22318,7 +22416,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 403.1850000000001 Td
+136.24 238.38500000000016 Td
/F3.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -22329,7 +22427,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 403.1850000000001 Td
+202.24 238.38500000000016 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22340,7 +22438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 403.1850000000001 Td
+207.74 238.38500000000016 Td
/F3.0 11 Tf
<64746f> Tj
ET
@@ -22351,7 +22449,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 403.1850000000001 Td
+224.24 238.38500000000016 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22362,7 +22460,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 403.1850000000001 Td
+229.74 238.38500000000016 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -22373,7 +22471,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 403.1850000000001 Td
+235.24 238.38500000000016 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22384,7 +22482,7 @@ ET
0.000 0.533 0.000 SCN
BT
-240.74 403.1850000000001 Td
+240.74 238.38500000000016 Td
/F4.0 11 Tf
<6e6577> Tj
ET
@@ -22395,7 +22493,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 403.1850000000001 Td
+257.24 238.38500000000016 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22406,7 +22504,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 403.1850000000001 Td
+262.74 238.38500000000016 Td
/F3.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -22417,7 +22515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 403.1850000000001 Td
+328.74 238.38500000000016 Td
/F3.0 11 Tf
<28293b> Tj
ET
@@ -22428,7 +22526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 388.4450000000001 Td
+59.239999999999995 223.64500000000015 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22439,7 +22537,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24 388.4450000000001 Td
+103.24 223.64500000000015 Td
/F3.0 11 Tf
<64746f> Tj
ET
@@ -22450,7 +22548,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74 388.4450000000001 Td
+119.74 223.64500000000015 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -22461,7 +22559,7 @@ ET
0.200 0.400 0.600 SCN
BT
-125.24 388.4450000000001 Td
+125.24 223.64500000000015 Td
/F3.0 11 Tf
<736574546f446f4974656d> Tj
ET
@@ -22472,7 +22570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 388.4450000000001 Td
+185.74 223.64500000000015 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -22483,7 +22581,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 388.4450000000001 Td
+191.24 223.64500000000015 Td
/F3.0 11 Tf
<746f446f4974656d> Tj
ET
@@ -22494,7 +22592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 388.4450000000001 Td
+235.24 223.64500000000015 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -22505,7 +22603,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 373.7050000000001 Td
+59.239999999999995 208.90500000000014 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22516,7 +22614,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24 373.7050000000001 Td
+103.24 208.90500000000014 Td
/F3.0 11 Tf
<64746f> Tj
ET
@@ -22527,7 +22625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74 373.7050000000001 Td
+119.74 208.90500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -22538,7 +22636,7 @@ ET
0.200 0.400 0.600 SCN
BT
-125.24 373.7050000000001 Td
+125.24 208.90500000000014 Td
/F3.0 11 Tf
<7365744465736372697074696f6e> Tj
ET
@@ -22549,7 +22647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 373.7050000000001 Td
+202.24 208.90500000000014 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -22560,7 +22658,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 373.7050000000001 Td
+207.74 208.90500000000014 Td
/F3.0 11 Tf
<746f446f4974656d> Tj
ET
@@ -22571,7 +22669,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 373.7050000000001 Td
+251.74 208.90500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -22582,7 +22680,7 @@ ET
0.200 0.400 0.600 SCN
BT
-257.24 373.7050000000001 Td
+257.24 208.90500000000014 Td
/F3.0 11 Tf
<6765744465736372697074696f6e> Tj
ET
@@ -22593,7 +22691,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 373.7050000000001 Td
+334.24 208.90500000000014 Td
/F3.0 11 Tf
<2829293b> Tj
ET
@@ -22604,7 +22702,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 358.9650000000001 Td
+59.239999999999995 194.16500000000013 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22615,7 +22713,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24 358.9650000000001 Td
+103.24 194.16500000000013 Td
/F3.0 11 Tf
<2e2e2e> Tj
ET
@@ -22626,7 +22724,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 344.2250000000001 Td
+59.239999999999995 179.42500000000013 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -22637,7 +22735,7 @@ ET
0.000 0.533 0.000 SCN
BT
-103.24 344.2250000000001 Td
+103.24 179.42500000000013 Td
/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -22648,7 +22746,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 344.2250000000001 Td
+136.24 179.42500000000013 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -22659,7 +22757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 344.2250000000001 Td
+141.74 179.42500000000013 Td
/F3.0 11 Tf
<64746f> Tj
ET
@@ -22670,7 +22768,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 344.2250000000001 Td
+158.24 179.42500000000013 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -22681,7 +22779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 329.48500000000007 Td
+59.239999999999995 164.68500000000012 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -22692,7 +22790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24 329.48500000000007 Td
+81.24 164.68500000000012 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -22703,7 +22801,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 314.74500000000006 Td
+59.239999999999995 149.9450000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -22714,7 +22812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24 314.74500000000006 Td
+81.24 149.9450000000001 Td
/F3.0 11 Tf
<2e2e2e> Tj
ET
@@ -22725,7 +22823,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 300.00500000000005 Td
+59.239999999999995 135.2050000000001 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -22736,7 +22834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 255.406 Td
+48.239999999999995 90.60600000000008 Td
/F2.0 13 Tf
<332e312e332e2052656c61746564205365727669636573> Tj
ET
@@ -22747,7 +22845,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 228.846 Td
+48.239999999999995 64.04600000000009 Td
/F1.0 10.5 Tf
<546869732073657276696365206973206120636f6d70616e696f6e20746f207468652064656661756c7420696d706c656d656e746174696f6e206f662074686520> Tj
ET
@@ -22758,7 +22856,7 @@ ET
0.694 0.129 0.275 SCN
BT
-372.6585 228.846 Td
+372.6585 64.04600000000009 Td
/F3.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -22769,18 +22867,92 @@ ET
0.200 0.200 0.200 SCN
BT
-503.9085 228.846 Td
+503.9085 64.04600000000009 Td
/F1.0 10.5 Tf
<2e> 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
+<3132> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+207 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 206 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F4.0 51 0 R
+/F3.0 41 0 R
+/F3.1 52 0 R
+/F1.0 8 0 R
+/F2.0 20 0 R
+>>
+/XObject << /Stamp1 2336 0 R
+>>
+>>
+/Annots [209 0 R 211 0 R]
+>>
+endobj
+208 0 obj
+[207 0 R /XYZ 0 645.89 null]
+endobj
+209 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-app-todoapp)
+>>
+/Subtype /Link
+/Rect [178.124375 569.8000000000001 285.2729583333333 584.0800000000002]
+/Type /Annot
+>>
+endobj
+210 0 obj
+[207 0 R /XYZ 0 109.29000000000008 null]
+endobj
+211 0 obj
+<< /Border [0 0 0]
+/Dest (_rgsvc_spi_ContentNegotiationService)
+/Subtype /Link
+/Rect [372.6585 62.57600000000009 503.9085 73.07600000000009]
+/Type /Annot
+>>
+endobj
+212 0 obj
+<< /Length 20361
+>>
+stream
+q
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-48.239999999999995 189.006 Td
+48.24 786.6659999999999 Td
/F2.0 18 Tf
<332e322e20> Tj
ET
@@ -22791,7 +22963,7 @@ ET
0.694 0.129 0.275 SCN
BT
-83.57399999999998 189.006 Td
+83.574 786.6659999999999 Td
/F3.0 18 Tf
<456d61696c4e6f74696669636174696f6e53657276696365> Tj
ET
@@ -22804,7 +22976,7 @@ ET
1.888 Tw
BT
-48.239999999999995 160.986 Td
+48.24 758.646 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -22819,7 +22991,7 @@ ET
1.888 Tw
BT
-71.54790092329544 160.986 Td
+71.54790092329546 758.646 Td
/F3.0 10.5 Tf
<456d61696c4e6f74696669636174696f6e53657276696365> Tj
ET
@@ -22834,7 +23006,7 @@ ET
1.888 Tw
BT
-197.54790092329546 160.986 Td
+197.54790092329546 758.646 Td
/F1.0 10.5 Tf
<20737570706f7274732074686520> Tj
ET
@@ -22849,7 +23021,7 @@ ET
1.888 Tw
BT
-271.0416036931818 160.986 Td
+271.0416036931818 758.646 Td
/F1.0 10.5 Tf
[<757365722072656769737472> 20.01953125 <6174696f6e>] TJ
ET
@@ -22864,7 +23036,7 @@ ET
1.888 Tw
BT
-356.11029953835225 160.986 Td
+356.11029953835225 758.646 Td
/F1.0 10.5 Tf
<202873656c66207369676e2d757029206665617475726573206f662074686520> Tj
ET
@@ -22879,7 +23051,7 @@ ET
1.888 Tw
BT
-512.3062050781249 160.986 Td
+512.3062050781249 758.646 Td
/
<TRUNCATED>
[2/3] isis-site git commit: ISIS-1291: updating docs for new
services. Also IsisTransaction now to clears the changed object properties
rather than AuditingService,
otherwise PublisherService would mis-report the metric of number of changed
object prop
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/86d69a8f/content/guides/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.html b/content/guides/rgsvc.html
index af35fdb..5734871 100644
--- a/content/guides/rgsvc.html
+++ b/content/guides/rgsvc.html
@@ -1103,6 +1103,12 @@ depends on:<br>
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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="paragraph">
@@ -2618,6 +2624,18 @@ Impl’n (g: a:)</th>
<div class="ulist">
<ul>
<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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>
+<li>
<p><code>o.a.i.v.ro</code> is an abbreviation for <code>org.apache.isis.viewer.restfulobjects</code></p>
</li>
</ul>
@@ -3227,6 +3245,12 @@ represented as the <code>Interaction</code> context.</p>
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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">
@@ -3485,7 +3509,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<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>
+<code>BackgroundCommandService2</code> extensions to these services have been introduced in <code>1.13.0-SNAPSHOT</code>).</p>
</div>
<div class="paragraph">
<p>The <code>BackgroundService2</code> is responsible for capturing a memento representing the command in a typesafe way,
@@ -3650,7 +3674,7 @@ a memento of the command such that it can be persisted. (In earlier versions, <
</div>
</div>
<div class="sect3">
-<h4 id="_rgsvc_api_BackgroundService_BackgroundCommandExecution">5.3.6. <code>BackgroundCommandExecution</code> abstract class</h4>
+<h4 id="_rgsvc_api_BackgroundService_BackgroundCommandExecution">5.3.6. <code>BackgroundCommandExec’n</code> abstract class</h4>
<div class="paragraph">
<p>The <code>BackgroundCommandExecution</code> (in isis-core) is an abstract template class provided by isis-core that defines an abstract hook method to obtain background `Command`s to be executed:</p>
</div>
@@ -4068,13 +4092,15 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="_interacting_with_the_services">5.4.4. Interacting with the services</h4>
<div class="paragraph">
-<p>Typically the domain objects have little need to interact with the <code>CommandContext</code> and <code>Command</code> directly; what is more useful is that these are persisted in support of the various use cases identified above.</p>
+<p>Typically domain objects will have little need to interact with the <code>CommandContext</code> and <code>Command</code> directly; what is
+more useful is that these are persisted in support of the various use cases identified above.</p>
</div>
<div class="paragraph">
<p>One case however where a domain object might want to obtain the <code>Command</code> is to determine whether it has been invoked in the foreground, or in the background. It can do this using the <code>getExecutedIn()</code> method:</p>
</div>
<div class="paragraph">
-<p>Although not often needed, this then allows the domain object to access the <code>Command</code> object through the <code>CommandContext</code> service. To expand th above example:</p>
+<p>Although not often needed, this then allows the domain object to access the <code>Command</code> object through the
+<code>CommandContext</code> service. To expand th above example:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -4097,11 +4123,11 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<p>If run in the background, it might then notify the user (eg by email) if all work is done.</p>
</div>
<div class="paragraph">
-<p>This leads us onto a related point, distinguishing the current effective user vs the originating "real" user. When running in the foreground, the current user can be obtained from the <code>DomainObjectContainer</code>, using:</p>
+<p>This leads us onto a related point, distinguishing the current effective user vs the originating "real" user. When running in the foreground, the current user can be obtained from the <a href="#_rgsvc_api_UserService"><code>UserService</code></a>, using:</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="predefined-type">String</span> user = container.getUser().getName();</code></pre>
+<pre class="CodeRay highlight"><code data-lang="java"><span class="predefined-type">String</span> user = userService.getUser().getName();</code></pre>
</div>
</div>
<div class="paragraph">
@@ -4133,15 +4159,275 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<div class="sect3">
<h4 id="_related_services_14">5.4.6. Related Services</h4>
<div class="paragraph">
-<p>As discussed above, the supporting <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> enables <code>Command</code> objects to be persisted. Other related services are the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a> and <a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>). For <code>BackgroundService</code> captures commands for execution in the background, while the [BackgroundCommandService] persists such commands for execution.</p>
+<p>The <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service is very similar in nature to the <a href="#_rgsvc_api_InteactionContext"><code>InteactionContext</code></a>, in that the
+<code>Command</code> object accessed through it is very similar to the <code>Interaction</code> object obtained from the <code>InteractionContext</code>.
+The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property,
+the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
</div>
<div class="paragraph">
-<p>The implementations of <code>CommandService</code> and <code>BackgroundCommandService</code> are intended to go together, so that persistent parent `Command`s can be associated with their child background `Command`s.</p>
+<p>Most of the time a <code>Command</code> will be followed directly by its corresponding <code>Interaction</code>. However, if the <code>Command</code>
+is annotated to run in the background (using <a href="rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a>, or
+is explicitly created through the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a>, then the actual
+interaction/execution is deferred until some other mechanism invokes the command (eg as described
+<a href="ugbtb.html#_ugbtb_headless-access_BackgroundCommandExecution">here</a>). The persistence of background commands
+requires a configured <a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>) to actually
+persist such commands for execution.</p>
+</div>
+<div class="paragraph">
+<p><code>Command</code>s - even if executed in the foreground - can also be persisted by way of the
+<a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a>. Implementations of <code>CommandService</code> and
+<code>BackgroundCommandService</code> are intended to go together, so that child <code>Command</code>s persistent (to be executed in the
+background) can be associated with their parent <code>Command</code>s (executed in the foreground, with the background <code>Command</code>
+created explicitly through the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a>).</p>
</div>
</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_api_InteractionContext">5.5. <code>InteractionContext</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
+<div class="paragraph">
+<p>The <code>InteractionContext</code> (<code>1.13.0-SNAPSHOT</code>) is a request-scoped domain service that is used to obtain the current <code>Interaction</code>.</p>
+</div>
+<div class="paragraph">
+<p>An <code>Interaction</code> generally consists of a single top-level <code>Execution</code>, either to invoke an action or to edit a property. If that top-level action or property uses <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> to invoke child actions/properties, then those sub-executions are captured as a call-graph. The <code>Execution</code> is thus a graph structure.</p>
+</div>
+<div class="paragraph">
+<p>If a bulk action is performed (as per an action annotated using <a href="rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>), then this will result in multiple <code>Interaction</code>s, one per selected object (not one <code>Interaction</code> with multiple top-level <code>Execution</code>s).</p>
+</div>
+<div class="sect3">
+<h4 id="_api_implementatin">5.5.1. API & Implementatin</h4>
+<div class="paragraph">
+<p>The public API of the service consists of several related classes:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>InteractionContext</code> domain service itself:</p>
+</li>
+<li>
+<p><code>Interaction</code> class, obtainable from the <code>InteractionContext</code></p>
+</li>
+<li>
+<p><code>Execution</code> class, obtainable from the <code>Interaction</code>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The <code>Execution</code> class itself is abstract; there are two subclasses, <code>ActionInvocation</code> and <code>PropertyEdit</code>.</p>
+</div>
+<div class="sect4">
+<h5 id="__code_interactioncontext_code"><code>InteractionContext</code></h5>
+<div class="paragraph">
+<p>The public API of the <code>InteractionContext</code> domain service itself consists of simply:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RequestScoped</span>
+<span class="directive">public</span> <span class="type">class</span> <span class="class">InteractionContext</span> {
+ <span class="directive">public</span> Interaction getInteraction(); <i class="conum" data-value="1"></i><b>(1)</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 the currently active {@link Interaction} for this thread.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>This class is concrete (is also the implementation).</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="__code_interaction_code"><code>Interaction</code></h5>
+<div class="paragraph">
+<p>The public API of the <code>Interaction</code> class consists of:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Interaction</span> {
+ <span class="directive">public</span> <span class="predefined-type">UUID</span> getTransactionId(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> Execution getPriorExecution(); <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="directive">public</span> Execution getCurrentExecution(); <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="directive">public</span> <span class="predefined-type">List</span><Execution> getExecutions(); <i class="conum" data-value="4"></i><b>(4)</b>
+ <span class="directive">public</span> <span class="type">int</span> next(<span class="directive">final</span> <span class="predefined-type">String</span> sequenceId); <i class="conum" data-value="5"></i><b>(5)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The unique identifier of this interaction. This will be the same value as held in <code>Command</code> (obtainable from <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>The member <code>Execution</code> (action invocation or property edit) that preceded the current one.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>The current execution.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>* Returns a (list of) execution}s in the order that they were pushed. Generally there will be just one entry in this list, but additional entries may arise from the use of mixins/contributions when re-rendering a modified object.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="5"></i><b>5</b></td>
+<td>Generates numbers in a named sequence. Used by the framework both to number successive interaction <code>Execution</code>s and for events published by the <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>This class is concrete (is also the implementation).</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="__code_interaction_execution_code"><code>Interaction.Execution</code></h5>
+<div class="paragraph">
+<p>The <code>Interaction.Execution</code> (static nested) class represents an action invocation/property edit as a node in a
+call-stack execution graph. Sub-executions can be performed using the
+<a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
+</div>
+<div class="paragraph">
+<p>It has the following public API:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">Execution</span> {
+ <span class="directive">public</span> Interaction getInteraction(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> InteractionType getInteractionType(); <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="directive">public</span> <span class="predefined-type">String</span> getMemberIdentifier(); <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="directive">public</span> <span class="predefined-type">Object</span> getTarget(); <i class="conum" data-value="4"></i><b>(4)</b>
+
+ <span class="directive">public</span> <span class="predefined-type">String</span> getTargetClass(); <i class="conum" data-value="5"></i><b>(5)</b>
+ <span class="directive">public</span> <span class="predefined-type">String</span> getTargetMember();
+
+ <span class="directive">public</span> Execution getParent(); <i class="conum" data-value="6"></i><b>(6)</b>
+ <span class="directive">public</span> <span class="predefined-type">List</span><Execution> getChildren();
+
+ <span class="directive">public</span> AbstractDomainEvent getEvent(); <i class="conum" data-value="7"></i><b>(7)</b>
+
+ <span class="directive">public</span> <span class="predefined-type">Timestamp</span> getStartedAt(); <i class="conum" data-value="8"></i><b>(8)</b>
+ <span class="directive">public</span> <span class="predefined-type">Timestamp</span> getCompletedAt();
+
+ <span class="directive">public</span> <span class="predefined-type">Object</span> getReturned(); <i class="conum" data-value="9"></i><b>(9)</b>
+ <span class="directive">public</span> <span class="exception">Exception</span> getThrew();
+
+ <span class="directive">public</span> T getDto(); <i class="conum" data-value="10"></i><b>(10)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The owning <code>Interaction</code>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Whether this is an action invocation or a property edit.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>A string uniquely identifying the action or property (similar to Javadoc syntax).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>The object on which the action is being invoked or property edited. In the case of a mixin this will be the mixin object itself (rather than the mixed-in object).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="5"></i><b>5</b></td>
+<td>A human-friendly description of the class of the target object, and of the name of the action invoked/property
+edited on the target object.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="6"></i><b>6</b></td>
+<td>The parent action/property that invoked this action/property edit (if any), and any actions/property edits made in
+turn via the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="7"></i><b>7</b></td>
+<td>The domain event fired via the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a> representing the
+execution of this action invocation/property edit.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="8"></i><b>8</b></td>
+<td>The date/time at which this execution started/completed.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="9"></i><b>9</b></td>
+<td>The object returned by the action invocation/property edit, or the exception thrown. For <code>void</code> methods and for actions returning collections, the value will be <code>null</code>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="10"></i><b>10</b></td>
+<td>A DTO (instance of the <a href="rgcms.html#_rgcms_schema_ixn">"ixn" schema</a>) being a serializable representation of this action invocation/property edit.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>There are two concrete subclasses of <code>Execution</code>.</p>
+</div>
+<div class="paragraph">
+<p>The first is <code>ActionInvocation</code>, representing the execution of an action being invoked:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ActionInvocation</span> <span class="directive">extends</span> Execution {
+ <span class="directive">public</span> <span class="predefined-type">List</span><<span class="predefined-type">Object</span>> getArgs(); <i class="conum" data-value="1"></i><b>(1)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The objects passed in as the arguments to the action’s parameters. Any of these could be <code>null</code>.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The second is <code>PropertyEdit</code>, and naturally enough represents the execution of a property being edited:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">PropertyEdit</span> <span class="directive">extends</span> Execution {
+ <span class="directive">public</span> <span class="predefined-type">Object</span> getNewValue(); <i class="conum" data-value="1"></i><b>(1)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The object used as the new value of the property. Could be <code>null</code> if the property is being cleared.</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_interacting_with_the_services_2">5.5.2. Interacting with the services</h4>
+<div class="paragraph">
+<p>Typically domain objects will have little need to interact with the <code>InteractionContext</code> and <code>Interaction</code> directly.
+The services are used within the framework however, primarily to support the
+<a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> SPI, and to emit domain events over the
+<a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_registering_the_service_6">5.5.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' default
+implementation of <code>InteractionContext</code> class is automatically registered (it is annotated with <code>@DomainService</code>)
+so no further configuration is required.</p>
+</div>
+<div class="paragraph">
+<p>The framework also takes responsibility for instantiating the <code>Interaction</code>, using the
+<a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a>.</p>
+</div>
<div class="admonitionblock note">
<table>
<tr>
@@ -4149,12 +4435,34 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<i class="fa icon-note" title="Note"></i>
</td>
<td class="content">
-TODO
+<div class="paragraph">
+<p>Unlike the similar <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> (discussed
+<a href="#_rgsvc_api_InteractionContext_Related-Classes">below</a>) there is no domain service to different
+implementations of <code>Interaction</code> to be used. If this were to be needed, then a custom implementation of
+ <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a> could always used).</p>
+</div>
</td>
</tr>
</table>
</div>
</div>
+<div class="sect3">
+<h4 id="_rgsvc_api_InteractionContext_Related-Classes">5.5.4. Related Classes</h4>
+<div class="paragraph">
+<p>This service is very similar in nature to <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>, in that the
+<code>Interaction</code> object accessed through it is very similar to the <code>Command</code> object obtained from the <code>CommandContext</code>.
+The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property,
+the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
+</div>
+<div class="paragraph">
+<p>Most of the time a <code>Command</code> will be followed directly by its corresponding <code>Interaction</code>. However, if the <code>Command</code>
+is annotated to run in the background (using <a href="rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a>, or
+is explicitly created through the <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a>, then the actual
+interaction/execution is deferred until some other mechanism invokes the command (eg as described
+<a href="ugbtb.html#_ugbtb_headless-access_BackgroundCommandExecution">here</a>).</p>
+</div>
+</div>
+</div>
<div class="sect2">
<h3 id="_rgsvc_api_MessageService">5.6. <code>MessageService</code></h3>
<div class="paragraph">
@@ -4245,7 +4553,7 @@ TODO
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_6">5.6.3. Registering the Service</h4>
+<h4 id="_registering_the_service_7">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
@@ -4309,7 +4617,7 @@ session and start a new transaction.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_7">5.7.3. Registering the Service</h4>
+<h4 id="_registering_the_service_8">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
@@ -4400,7 +4708,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_8">5.8.4. Registering the Service</h4>
+<h4 id="_registering_the_service_9">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
@@ -4479,7 +4787,7 @@ end of the transaction, or immediately prior to the next query.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_9">5.9.3. Registering the Service</h4>
+<h4 id="_registering_the_service_10">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
@@ -4734,7 +5042,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.10.4. Registering the Service</h4>
+<h4 id="_registering_the_service_11">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
@@ -4834,6 +5142,12 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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">
@@ -5185,7 +5499,7 @@ of that service (and may be useful for other use cases).</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_11">6.3.2. Registering the Service</h4>
+<h4 id="_registering_the_service_12">6.3.2. 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
@@ -5243,13 +5557,27 @@ Impl’n (g: a:)</th>
<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>1.13.0-SNAPSHOT</code>) Creates memento of current action invocation, for use as a serializable XML reified command. The
+most notable usage of this is to allow the execution of the <code>Command</code> to be deferred to run in the background (via
+<a href="rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a> or
+<a href="rgant.html#_rgant-Property_command"><code>@Property#commandExecuteIn()</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>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_InteractionDtoServiceInternal"><code>o.a.i.c.</code><br>
+<code>m.s.ixn</code><br>
+<code>InteractionDtoServiceInternal</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">(<code>1.13.0-SNAPSHOT</code>) Creates DTO for the current execution of an action invocation or property edit, 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.m.s.command</code><br>
+<code>isis-core-metamodel</code></p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
</tbody>
</table>
<div class="paragraph">
@@ -5258,6 +5586,12 @@ Impl’n (g: a:)</th>
<div class="ulist">
<ul>
<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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>
@@ -5281,7 +5615,7 @@ as a <a href="#_rgsvc_spi_BackgroundCommandService">background command</a>.</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> {
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">CommandDtoServiceInternal</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,
@@ -5324,11 +5658,11 @@ 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>
+<td>add the arguments of an action to an <code>ActionDto</code>. This is used when the command is actually executed (per <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>) to populate the parameters of the equivalent <code>ActionInvocationDto</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>
+<td>add the new value argument of a property to a <code>PropertyDto</code>. This is used when the command is actually executed (per <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>) to set the the new value of the equivalent <code>PropertyEditDto</code>.</td>
</tr>
</table>
</div>
@@ -5336,21 +5670,67 @@ targets, for symmetry with actions).</td>
<p>The SPI is implemented by <code>o.a.i.c.r.s.command.CommandDtoServiceInternalServiceDefault</code>.</p>
</div>
</div>
+<div class="sect3">
+<h4 id="_related_services_17">7.1.2. Related Services</h4>
+<div class="paragraph">
+<p>The design of this service is similar to that of <a href="#_rgsvc_spi_InteractionDtoServiceInternal"><code>InteractionDtoServiceInternal</code></a>, used to create the <code>MemberExecutionDto</code> (from the <a href="rgcms.html#_rgcms_schema-ixn">"ixn" schema</a>).</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">
+<div class="paragraph">
+<p>The <code>InteractionDtoServiceInternal</code> internal domain service (<code>1.13.0-SNAPSHOT</code>) is used by the framework to create and update DTOs representing member executions, ie the invocation of an action or the editing of a property. The DTO is in all cases a subclass of <code>MemberExecutionDto</code>, from the <a href="rgcms.html#_rgcms_schema-ixn">"ixn" schema</a>, and subsequently accessible from the <code>Interaction</code> object (per the <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> service).</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_implementation_2">7.2.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">InteractionDtoServiceInternal</span> {
+ ActionInvocationDto asActionInvocationDto( <i class="conum" data-value="1"></i><b>(1)</b>
+ ObjectAction objectAction,
+ ObjectAdapter targetAdapter,
+ <span class="predefined-type">List</span><ObjectAdapter> argumentAdapters);
+ PropertyEditDto asPropertyEditDto( <i class="conum" data-value="2"></i><b>(2)</b>
+ OneToOneAssociation property,
+ ObjectAdapter targetAdapter,
+ ObjectAdapter newValueAdapterIfAny);
+ ActionInvocationDto updateResult( <i class="conum" data-value="3"></i><b>(3)</b>
+ ActionInvocationDto actionInvocationDto,
+ ObjectAction objectAction,
+ <span class="predefined-type">Object</span> resultPojo);
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
<table>
<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>called by the framework when invoking an action, to create a DTO capturing the details of the action invocation (target, arguments etc).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>called by the framework when editing a property, to create a DTO (for the <a href="rgcms.html#_rgcms_schema-ixn">"ixn" schema</a>) capturing the details of the property edit (target, new value etc).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>called by the framework to attach the result of an action invocation to the aforementioned DTO.</td>
</tr>
</table>
</div>
+<div class="paragraph">
+<p>The service is implemented by <code>o.a.i.core.runtime.services.ixn.InteractionDtoServiceInternalDefault</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_related_services_18">7.2.2. Related Services</h4>
+<div class="paragraph">
+<p>The design of this service is similar to that of <a href="#_rgsvc_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a>, used to create the <code>CommandDto</code> (from the <a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a>).</p>
+</div>
+</div>
</div>
</div>
</div>
@@ -5495,6 +5875,12 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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="paragraph">
@@ -5538,11 +5924,23 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
<div class="paragraph">
<p>Key:</p>
</div>
+<div class="paragraph">
+<p>Key:</p>
+</div>
<div class="ulist">
<ul>
<li>
<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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">
@@ -5660,7 +6058,7 @@ Supercedes methods in <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainOb
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_12">8.1.3. Registering the Service</h4>
+<h4 id="_registering_the_service_13">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
@@ -5772,7 +6170,7 @@ instead subclass from <code>o.a.i.applib.clock.Clock</code> singleton (as descri
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_13">8.2.3. Registering the Service</h4>
+<h4 id="_registering_the_service_14">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
@@ -5786,7 +6184,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_17">8.2.4. Related services</h4>
+<h4 id="_related_services_19">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>
@@ -6433,7 +6831,7 @@ validation defined by <a href="rgcms.html#_rgcms_methods_reserved_validate"><cod
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_14">8.3.3. Registering the Service</h4>
+<h4 id="_registering_the_service_15">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
@@ -6959,7 +7357,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_18">8.4.10. Related Services</h4>
+<h4 id="_related_services_20">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>
@@ -7050,7 +7448,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_15">8.5.4. Registering the Service</h4>
+<h4 id="_registering_the_service_16">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
@@ -7064,7 +7462,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_19">8.5.5. Related Services</h4>
+<h4 id="_related_services_21">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>
@@ -7193,7 +7591,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_16">8.6.3. Registering the Service</h4>
+<h4 id="_registering_the_service_17">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
@@ -7207,7 +7605,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_20">8.6.4. Related Services</h4>
+<h4 id="_related_services_22">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>
@@ -7289,7 +7687,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_17">8.7.3. Registering the Service</h4>
+<h4 id="_registering_the_service_18">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
@@ -7422,6 +7820,25 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</tr>
</tbody>
</table>
+<div class="paragraph">
+<p>Key:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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_api_BookmarkService">9.1. <code>BookmarkService2</code></h3>
<div class="paragraph">
@@ -7572,7 +7989,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_18">9.1.4. Registering the Service</h4>
+<h4 id="_registering_the_service_19">9.1.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
@@ -7787,7 +8204,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_21">9.3.5. Related Services</h4>
+<h4 id="_related_services_23">9.3.5. Related Services</h4>
<div class="paragraph">
<p>The email service is used by the <a href="#_rgsvc_spi_EmailNotificationService"><code>EmailNotificationService</code></a> which is, in turn, used by <a href="#_rgsvc_spi_UserRegistrationService"><code>UserRegistrationService</code></a>.</p>
</div>
@@ -7962,7 +8379,7 @@ exposed in the UI through mixins to <a href="rgcms.html#_rgcms_classes_mixins_Dt
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_19">9.5.3. Registering the Service</h4>
+<h4 id="_registering_the_service_20">9.5.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
@@ -8162,7 +8579,7 @@ entities). Nulls can also be set.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_22">9.6.3. Related Services</h4>
+<h4 id="_related_services_24">9.6.3. Related Services</h4>
<div class="paragraph">
<p>(Prior to <code>1.13.0-SNAPSHOT</code>), the memento service is used by the
<a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service and also
@@ -8171,7 +8588,7 @@ representation of an action invocation.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_20">9.6.4. Registering the Service</h4>
+<h4 id="_registering_the_service_21">9.6.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
@@ -8410,7 +8827,7 @@ responsibility for determining what is included within the snapshot from the cal
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_21">9.7.5. Registering the Service</h4>
+<h4 id="_registering_the_service_22">9.7.5. 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
@@ -8424,7 +8841,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_23">9.7.6. Related Services</h4>
+<h4 id="_related_services_25">9.7.6. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a> provides a mechanism for obtaining a string representations of a single domain object.</p>
</div>
@@ -8530,6 +8947,25 @@ within the metamodel.</p>
</tr>
</tbody>
</table>
+<div class="paragraph">
+<p>Key:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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_api_ApplicationFeatureRepository">10.1. <code>ApplicationFeatureRepository</code></h3>
<div class="paragraph">
@@ -8584,7 +9020,7 @@ module, where the string representations of the various features are used to rep
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_22">10.1.2. Registering the Service</h4>
+<h4 id="_registering_the_service_23">10.1.2. 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
@@ -8789,11 +9225,11 @@ a number of aspects of Apache Isis' internal metamodel.</p>
<div class="sect3">
<h4 id="_implementation_26">10.3.2. Implementation</h4>
<div class="paragraph">
-<p>The framework provides a default implementation of this service (<code>org.apache.isis.core.metamodel.services.metamodel.MetaModelServiceDefault</code>).</p>
+<p>The framework provides a default implementation of this service, <code>o.a.i.c.m.services.metamodel.MetaModelServiceDefault</code>.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_23">10.3.3. Registering the Service</h4>
+<h4 id="_registering_the_service_24">10.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
@@ -8807,7 +9243,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_24">10.3.4. Related Services</h4>
+<h4 id="_related_services_26">10.3.4. Related Services</h4>
<div class="paragraph">
<p>The <code>MetaModelServiceMenu</code> provides a method to download all domain members as a CSV. Internally
this calls <code>MetaModelService#export()</code>. Under the covers this uses the API provided by the
@@ -8895,7 +9331,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_24">10.4.4. Registering the Service</h4>
+<h4 id="_registering_the_service_25">10.4.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
@@ -8984,7 +9420,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_25">10.5.3. Registering the Service</h4>
+<h4 id="_registering_the_service_26">10.5.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
@@ -8992,7 +9428,7 @@ implementation of <code>SwaggerService</code> service is automatically registere
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_25">10.5.4. Related Services</h4>
+<h4 id="_related_services_27">10.5.4. Related Services</h4>
<div class="paragraph">
<p>A <code>SwaggerServiceMenu</code> domain service provides a prototype action that enables the swagger spec to be downloaded from the Wicket viewer’s UI.</p>
</div>
@@ -9149,7 +9585,7 @@ SpecificationProvider</code></a>.</p></td>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_26">11.1.3. Related Services</h4>
+<h4 id="_related_services_28">11.1.3. Related Services</h4>
<div class="paragraph">
<p>The service interacts with <a href="#_rgsvc_spi_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a>.</p>
</div>
@@ -9210,7 +9646,7 @@ other user. This is useful both for <a href="ugtst.html#_ugtst_integ-test-suppor
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_26">11.2.3. Registering the Service</h4>
+<h4 id="_registering_the_service_27">11.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
@@ -9400,6 +9836,12 @@ primary benefit (apart from decoupling responsibilities) is that it ensures that
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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">
@@ -9732,18 +10174,65 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
<div class="sect2">
<h3 id="_rgsvc_api_MetricsService">12.2. <code>MetricsService</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
-<div class="admonitionblock note">
+<div class="paragraph">
+<p>The <code>MetricsService</code> (<code>1.13.0-SNAPSHOT</code>) is a request-scoped domain service that hooks into the JDO/DataNucleus
+ObjectStore to provide a number of counters relating to numbers of object loaded, dirtied etc.</p>
+</div>
+<div class="paragraph">
+<p>The service is used by the <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service (to populate the DTO held by the <code>Interaction.Execution</code>) and also by the (internal) <a href="#_rgsvc_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a> domain service (to populate
+the <code>PublishedObjects</code> class.</p>
+</div>
+<div class="sect3">
+<h4 id="_api_implementation_16">12.2.1. API & Implementation</h4>
+<div class="paragraph">
+<p>The API of the service is:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@RequestScoped</span>
+<span class="directive">public</span> <span class="type">interface</span> <span class="class">MetricsService</span> {
+ <span class="type">int</span> numberObjectsLoaded(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="type">int</span> numberObjectsDirtied(); <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="type">int</span> numberObjectPropertiesModified(); <i class="conum" data-value="3"></i><b>(3)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
<table>
<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>The number of objects that have, so far in this request, been loaded from the database. Corresponds to the number of times that <code>javax.jdo.listener.LoadLifecycleListener#postLoad(InstanceLifecycleEvent)</code> is fired.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>The number of objects that have, so far in this request, been dirtied/will need updating in the database); a good measure of the footprint of the interaction. Corresponds to the number of times that <code>javax.jdo.listener.DirtyLifecycleListener#preDirty(InstanceLifecycleEvent)</code> callback is fired.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>The number of individual properties of objects that were modified; a good measure of the amount of work being done in the interaction. Corresponds to the number of times that the <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a>'s <code>audit(…​)</code> method will be called as the transaction completes.</td>
</tr>
</table>
</div>
+<div class="paragraph">
+<p>The framework provides a default implementation of this API, namely <code>o.a.i.c.r.s.metrics.MetricsServiceDefault</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_registering_the_service_28">12.2.2. 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' default
+implementation of <code>MetricsService</code> class is automatically registered (it is annotated with <code>@DomainService</code>)
+so no further configuration is required.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_related_services_29">12.2.3. Related Services</h4>
+<div class="paragraph">
+<p>The <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> also captures the metrics gathered by the
+<code>MetricsService</code> and publishes them as part of the <code>PublishedObjects</code> class (part of its SPI).</p>
+</div>
+</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_api_QueryResultsCache">12.3. <code>QueryResultsCache</code></h3>
@@ -9768,7 +10257,7 @@ TODO
</table>
</div>
<div class="sect3">
-<h4 id="_api_implementation_16">12.3.1. API & Implementation</h4>
+<h4 id="_api_implementation_17">12.3.1. API & Implementation</h4>
<div class="paragraph">
<p>The API defined by <code>QueryResultsCache</code> is:</p>
</div>
@@ -9871,7 +10360,7 @@ TODO
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_27">12.3.3. Registering the Service</h4>
+<h4 id="_registering_the_service_29">12.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
@@ -9885,7 +10374,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_27">12.3.4. Related Services</h4>
+<h4 id="_related_services_30">12.3.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> service is also intended for actions that are called many times, allowing arbitrary information to be shared between them. Those methods could be called from some outer loop in domain code, or by the framework itself if the action invoked has the <a href="rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a> annotation attribute set to <code>OBJECT_AND_COLLECTION</code> or <code>COLLECTION_ONLY</code>.</p>
</div>
@@ -10262,7 +10751,7 @@ public static final String KEY_DISABLE_AUTOFLUSH = "isis.services.container.disa
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_28">12.4.4. Registering the Service</h4>
+<h4 id="_registering_the_service_30">12.4.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
@@ -10276,7 +10765,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_28">12.4.5. Related Services</h4>
+<h4 id="_related_services_31">12.4.5. Related Services</h4>
<div class="paragraph">
<p>the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a> is often used in conjunction with the <code>RepositoryService</code>, to instantiate domain objects before persisting.</p>
</div>
@@ -10389,6 +10878,12 @@ a configured <code>EmailService</code></p></td>
<li>
<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
</li>
+<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="paragraph">
@@ -10483,7 +10978,7 @@ implementing a <a href="ugbtb.html#_ugbtb_decoupling_vetoing-visibility">vetoing
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_29">13.1.5. Related Services</h4>
+<h4 id="_related_services_32">13.1.5. Related Services</h4>
<div class="paragraph">
<p>The auditing service works very well with the <a href="#<em>rgsvc_spi_CommandService"><code>CommandService</code></a>. The <code>CommandService</code> captures the _cause</em> of an interaction (an action was invoked, a property was edited), while the <code>AuditingService3</code> captures the <em>effect</em> of that interaction in terms of changed state.</p>
</div>
@@ -10597,7 +11092,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_30">13.2.4. Related Services</h4>
+<h4 id="_related_services_33">13.2.4. Related Services</h4>
<div class="paragraph">
<p>This service is intended (though not mandated) to be used by implementations of <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> module does use it (though the (non-ASF)
<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module does not).</p>
@@ -10663,11 +11158,12 @@ the <code>InteractionDtoUtils</code> utility class. The XML can either serializ
<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">PublishedObjects</span> <span class="directive">extends</span> HasTransactionId, HasUsername {
- <span class="predefined-type">UUID</span> getTransactionId(); <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="predefined-type">String</span> getUsername(); <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="predefined-type">Timestamp</span> getCompletedAt(); <i class="conum" data-value="3"></i><b>(3)</b>
- ChangesDto getDto(); <i class="conum" data-value="4"></i><b>(4)</b>
- <span class="type">int</span> getNumberLoaded(); <i class="conum" data-value="5"></i><b>(5)</b>
+ <span class="predefined-type">UUID</span> getTransactionId(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="predefined-type">String</span> getUsername(); <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="predefined-type">Timestamp</span> getCompletedAt(); <i class="conum" data-value="3"></i><b>(3)</b>
+ ChangesDto getDto(); <i class="conum" data-value="4"></i><b>(4)</b>
+
+ <span class="type">int</span> getNumberLoaded(); <i class="conum" data-value="5"></i><b>(5)</b>
<span class="type">int</span> getNumberCreated();
<span class="type">int</span> getNumberUpdated();
<span class="type">int</span> getNumberDeleted();
@@ -10748,7 +11244,7 @@ suppressed either using security or by implementing a
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_31">13.3.5. Related Services</h4>
+<h4 id="_related_services_34">13.3.5. Related Services</h4>
<div class="paragraph">
<p>This service supports two main use cases:</p>
</div>
@@ -11023,7 +11519,7 @@ suppressed either using security or by implementing a
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_32">13.4.5. Related Services</h4>
+<h4 id="_related_services_35">13.4.5. Related Services</h4>
<div class="paragraph">
<p>The <code>PublishingService</code> is intended for coarse-grained publish/subscribe for system-to-system interactions, from
Apache Isis to some other system. Here the only events published are those that action invocations (for actions
@@ -11184,7 +11680,7 @@ to implement a subclass and register.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_33">13.5.4. Related Services</h4>
+<h4 id="_related_services_36">13.5.4. Related Services</h4>
<div class="paragraph">
<p>The most common use case is to allow users to sign-up through Apache Isis' Wicket viewer. Because the process requires email to be sent, the following services must be configured:</p>
</div>
@@ -11292,6 +11788,12 @@ Impl’n (g: a:)</th>
<div class="ulist">
<ul>
<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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>
@@ -11301,48 +11803,243 @@ Impl’n (g: a:)</th>
</div>
<div class="sect2">
<h3 id="_rgsvc_spi_AuditingServiceInternal">14.1. <code>AuditingServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
-<div class="admonitionblock note">
+<div class="paragraph">
+<p>The (internal) <code>AuditingServiceInternal</code> domain service (<code>1.13.0-SNAPSHOT</code>) acts as an internal facade to any
+configured <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a>. It is responsible for obtaining the details
+of all changes to domain objects within an interaction, and then to call the configured <code>AuditingService</code> to actually
+create audit entries of those changes.</p>
+</div>
+<div class="paragraph">
+<p>The service is a no-op if there is no configured <code>AuditingService</code>.</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_and_implementation">14.1.1. SPI and 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">class</span> <span class="class">AuditingServiceInternal</span> {
+ <span class="directive">public</span> <span class="type">boolean</span> canAudit(); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> <span class="type">void</span> audit(); <i class="conum" data-value="2"></i><b>(2)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
<table>
<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>whether auditing is enabled; checks to see if any <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> has been configured.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>uses the <a href="#_rgsvc_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> to obtain details of the changed properties, then call the configured <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a>.</td>
</tr>
</table>
</div>
+<div class="paragraph">
+<p>The service implementation is <code>o.a.i.c.r.s.auditing.AuditingServiceInternal</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_registering_the_service_31">14.1.2. 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' default
+implementation of <code>AuditingServiceInternal</code> class is automatically registered (it is annotated with <code>@DomainService</code>)
+so no further configuration is required.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_related_classes">14.1.3. Related Classes</h4>
+<div class="paragraph">
+<p>The service delegates between the (internal) <a href="#_rgsvc_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the configured <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a>. If no such <code>AuditingService</code> is configured, this service is in effect a no-op.</p>
+</div>
+<div class="paragraph">
+<p>The (internal) <a href="#_rgsvc_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a> performs a similar function for the <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>, also collating details of the changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
+</div>
+</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_spi_ChangedObjectsServiceInternal">14.2. <code>ChangedObjectsServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
-<div class="admonitionblock note">
+<div class="paragraph">
+<p>The <code>ChangedObjectsServiceInternal</code> class (<code>1.13.0-SNAPSHOT</code>) is an (internal) request-scoped domain service that is
+responsible for collecting the details of all changes to domain objects within an interaction. This is then used by
+various other (internal) domain services, notably
+<a href="#_rgsvc_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> and
+<a href="#_rgsvc_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a>.</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_and_implementation_2">14.2.1. SPI and 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="annotation">@RequestScoped</span>
+<span class="directive">public</span> <span class="type">class</span> <span class="class">ChangedObjectsServiceInternal</span> {
+ <span class="directive">public</span> <span class="type">void</span> enlistCreated(<span class="directive">final</span> ObjectAdapter adapter); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> <span class="type">void</span> enlistUpdating(<span class="directive">final</span> ObjectAdapter adapter);
+ <span class="directive">public</span> <span class="type">void</span> enlistDeleting(<span class="directive">final</span> ObjectAdapter adapter);
+
+ <span class="directive">public</span> <span class="type">boolean</span> hasChangedAdapters(); <i class="conum" data-value="2"></i><b>(2)</b>
+
+ <span class="directive">public</span> <span class="predefined-type">Map</span><ObjectAdapter, PublishedObject.ChangeKind> getChangeKindByEnlistedAdapter(); <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="directive">public</span> <span class="type">int</span> numberObjectsDirtied();
+ <span class="directive">public</span> <span class="type">int</span> numberObjectPropertiesModified();
+
+ <span class="directive">public</span> <span class="predefined-type">Set</span><<span class="predefined-type">Map</span>.Entry<AdapterAndProperty, PreAndPostValues>> getChangedObjectProperties(); <i class="conum" data-value="4"></i><b>(4)</b>
+
+ <span class="directive">public</span> <span class="type">void</span> clearChangedObjectProperties(); <i class="conum" data-value="5"></i><b>(5)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
<table>
<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Enlists an object that has just been created, updated or deleted, capturing the pre-modification values of the properties.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Used by the framework to determine whether to set the "persist hint" on the <code>Command</code> object (as per <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Used by <a href="#_rgsvc_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a> to obtain details of and
+counters of all objects changed within the transaction.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>Used by <a href="#_rgsvc_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> to obtain all pairs of
+pre/post values of changed properties</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="5"></i><b>5</b></td>
+<td>Called by the framework to for clean up after auditing and publishing has completed.</td>
</tr>
</table>
</div>
+<div class="paragraph">
+<p>For enlisted objects, if just created, then a dummy value <code>"[NEW]"</code> is used for the pre-modification value; if just
+deleted, then a dummy value <code>"[DELETED]"</code> is used for the post-modification value. The post-modification values of
+properties are captured when the transaction commits.</p>
+</div>
+<div class="paragraph">
+<p>The service implementation is <code>o.a.i.c.r.s.changes.ChangedObjectsServiceInternal</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_registering_the_service_32">14.2.2. 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' default
+implementation of <code>ChangedObjectsServiceInternal</code> class is automatically registered (it is annotated with <code>@DomainService</code>)
+so no further configuration is required.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_related_classes_2">14.2.3. Related Classes</h4>
+<div class="paragraph">
+<p>Both the <a href="#_rgsvc_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> and
+<a href="#_rgsvc_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a> (internal) domain services query
+this object.</p>
+</div>
+</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_spi_PublishingServiceInternal">14.3. <code>PublishingServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</h3>
-<div class="admonitionblock note">
+<div class="paragraph">
+<p>The (internal) <code>PublishingServiceInternal</code> domain service (<code>1.13.0-SNAPSHOT</code>) acts as an internal facade to any
+configured <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> or (deprecated in <code>1.13.0-SNAPSHOT</code>)
+<a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> domain services.</p>
+</div>
+<div class="paragraph">
+<p>For published action invocations/ property edits, it provides an API for those member executions to call.</p>
+</div>
+<div class="paragraph">
+<p>For published objects, it provides an API for the framework to call at the end of the interaction; it obtains details
+of the changed objects (from the
+<a href="#_rgsvc_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a>) and filters them to just
+those objects that are to be published; these are then passed through to any configured <code>PublisherService</code> or
+<code>PublishingService</code> implementations.</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_and_implementation_3">14.3.1. SPI and 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">class</span> <span class="class">PublishingServiceInternal</span> {
+ <span class="type">void</span> publishAction(
+ Interaction.Execution execution, <i class="conum" data-value="1"></i><b>(1)</b>
+ ObjectAction objectAction, <i class="conum" data-value="2"></i><b>(2)</b>
+ IdentifiedHolder identifiedHolder,
+ ObjectAdapter targetAdapter,
+ <span class="predefined-type">List</span><ObjectAdapter> parameterAdapters,
+ ObjectAdapter resultAdapter);
+ <span class="type">void</span> publishProperty( <i class="conum" data-value="3"></i><b>(3)</b>
+ Interaction.Execution execution);
+ <span class="type">void</span> publishObjects(); <i class="conum" data-value="4"></i><b>(4)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
<table>
<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>to publish an action invocation, as represented by the specified member <code>Execution</code> parameter and with the
+<a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> annotation attribute or equivalent, to any configured
+<a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>. The <code>Execution</code> object will be an instance of
+<code>ActionInvocation</code> (see <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> for details).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>the remaining parameters are to support the publishing of the action to any configured
+<a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> services (deprecated in <code>1.13.0-SNAPSHOT</code>).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>to publish a property edit, as as represented by the specified member <code>Execution</code> parameter and with the
+<a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation attribute or equivalent, to any
+configured <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>. The <code>Execution</code> object will be an instance
+of <code>PropertyEdit</code> (see <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> for details).</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>to publish all changed objects that are to be published (with the
+<a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> annotation attribute or equivalent).</td>
</tr>
</table>
</div>
+<div class="paragraph">
+<p>The service implementation is <code>o.a.i.c.m.s.publishing.PublishingServiceInternal</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_registering_the_service_33">14.3.2. 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' default
+implementation of <code>PublishingServiceInternal</code> class is automatically registered (it is annotated with <code>@DomainService</code>)
+so no further configuration is required.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_related_classes_3">14.3.3. Related Classes</h4>
+<div class="paragraph">
+<p>The service delegates between the (internal)
+<a href="#_rgsvc_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the
+configured <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> and
+ <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p>
+</div>
+<div class="paragraph">
+<p>The (internal) <a href="#_rgsvc_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> performs a similar
+function for the <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>, also collating details of the
+changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
+</div>
+</div>
</div>
</div>
</div>
@@ -11390,6 +12087,25 @@ TODO
</tr>
</tbody>
</table>
+<div class="paragraph">
+<p>Key:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
+</li>
+<li>
+<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
+</li>
+<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_ClassDiscoveryService">15.1. <code>ClassDiscoveryService</code></h3>
<div class="paragraph">
@@ -11682,7 +12398,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_end_user_experience">5.3.3. End-user experience</a></li>
<li><a href="#_registering_the_services_11">5.3.4. Registering the Services</a></li>
<li><a href="#_related_services_13">5.3.5. Related Services</a></li>
-<li><a href="#_rgsvc_api_BackgroundService_BackgroundCommandExecution">5.3.6. <code>BackgroundCommandExecution</code> abstract class</a></li>
+<li><a href="#_rgsvc_api_BackgroundService_BackgroundCommandExecution">5.3.6. <code>BackgroundCommandExec’n</code> abstract class</a></li>
<li><a href="#_rgsvc_api_BackgroundService_Quartz">5.3.7. Quartz Scheduler Configuration</a></li>
</ul>
</li>
@@ -11696,19 +12412,32 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_related_services_14">5.4.6. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_api_InteractionContext">5.5. <code>InteractionContext</code> (<code>1.13.0-SNAPSHOT</code>)</a></li>
+<li><a href="#_rgsvc_api_InteractionContext">5.5. <code>InteractionContext</code> (<code>1.13.0-SNAPSHOT</code>)</a>
+<ul class="sectlevel3">
+<li><a href="#_api_implementatin">5.5.1. API & Implementatin</a>
+<ul class="sectlevel4">
+<li><a href="#__code_interactioncontext_code"><code>InteractionContext</code></a></li>
+<li><a href="#__code_interaction_code"><code>Interaction</code></a></li>
+<li><a href="#__code_interaction_execution_code"><code>Interaction.Execution</code></a></li>
+</ul>
+</li>
+<li><a href="#_interacting_with_the_services_2">5.5.2. Interacting with the services</a></li>
+<li><a href="#_registering_the_service_6">5.5.3. Registering the Service</a></li>
+<li><a href="#_rgsvc_api_InteractionContext_Related-Classes">5.5.4. Related Classes</a></li>
+</ul>
+</li>
<li><a href="#_rgsvc_api_MessageService">5.6. <code>MessageService</code></a>
<ul class="sectlevel3">
<li><a href="#_api_and_usage">5.6.1. API and Usage</a></li>
<li><a href="#_implementation_16">5.6.2. Implementation</a></li>
-<li><a href="#_registering_the_service_6">5.6.3. Registering the Service</a></li>
+<li><a href="#_registering_the_service_7">5.6.3. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_SessionManagementService">5.7. <code>SessionManagementService</code></a>
<ul class="sectlevel3">
<li><a href="#_api">5.7.1. API</a></li>
<li><a href="#_implementation_17">5.7.2. Implementation</a></li>
-<li><a href="#_registering_the_service_7">5.7.3. Registering the Service</a></li>
+<li><a href="#_registering_the_service_8">5.7.3. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_TitleService">5.8. <code>TitleService</code></a>
@@ -11716,14 +12445,14 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_api_2">5.8.1. API</a></li>
<li><a href="#_usage_6">5.8.2. Usage</a></li>
<li><a href="#_implementation_18">5.8.3. Implementation</a></li>
-<li><a href="#_registering_the_service_8">5.8.4. Registering the Service</a></li>
+<li><a href="#_registering_the_service_9">5.8.4. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_TransactionService">5.9. <code>TransactionService</code></a>
<ul class="sectlevel3">
<li><a href="#_api_3">5.9.1. API</a></li>
<li><a href="#_implementation_19">5.9.2. Implementation</a></li>
-<li><a href="#_registering_the_service_9">5.9.3. Registering the Service</a></li>
+<li><a href="#_registering_the_service_10">5.9.3. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_WrapperFactory">5.10. <code>WrapperFactory</code></a>
@@ -11731,7 +12460,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_api_4">5.10.1. API</a></li>
<li><a href="#_usage_7">5.10.2. Usage</a></li>
<li><a href="#_listener_api">5.10.3. Listener API</a></li>
-<li><a href="#_registering_the_service_10">5.10.4. Registering the Service</a></li>
+<li><a href="#_registering_the_service_11">5.10.4. Registering the Service</a></li>
</ul>
</li>
</ul>
@@ -11761,7 +12490,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_rgsvc_api_HomePageProviderService">6.3. <code>HomePageProviderService</code></a>
<ul class="sectlevel3">
<li><a href="#_api_implementation_5">6.3.1. API & Implementation</a></li>
-<li><a href="#_registering_the_service_11">6.3.2. Registering the Service</a></li>
+<li><a href="#_registering_the_service_12">6.3.2. Registering the Service</a></li>
</ul>
</li>
</ul>
@@ -11771,9 +12500,15 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_rgsvc_spi_CommandDtoServiceInternal">7.1. <code>CommandDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</a>
<ul class="sectlevel3">
<li><a href="#_spi_implementation">7.1.1. SPI & Implementation</a></li>
+<li><a href="#_related_services_17">7.1.2. Related Services</a></li>
+</ul>
+</li>
+<li><a href="#_rgsvc_spi_InteractionDtoServiceInternal">7.2. <code>InteractionDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</a>
+<ul class="sectlevel3">
+<li><a href="#_spi_implementation_2">7.2.1. SPI & Implementation</a></li>
+<li><a href="#_related_services_18">7.2.2. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_spi_InteractionDtoServiceInternal">7.2. <code>InteractionDtoServiceInternal</code> (<code>1.13.0-SNAPSHOT</code>)</a></li>
</ul>
</li>
<li><a href="#_rgsvc_core-domain-api">8. Core/Domain API</a>
@@ -11786,15 +12521,15 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_alternative_implementations_2">Alternative Implementations</a></li>
</ul>
</li>
-<li><a href="#_registering_the_service_12">8.1.3. Registering the Service</a></li>
+<li><a href="#_registering_the_service_13">8.1.3. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_ConfigurationService">8.2. <code>ConfigurationService</code></a>
<ul class="sectlevel3">
<li><a href="#_api_and_usage_2">8.2.1. API and Usage</a></li>
<li><a href="#_implementation_22">8.2.2. Implementation</a></li>
-<li><a href="#_registering_the_service_13">8.2.3. Registering the Service</a></li>
-<li><a href="#_related_services_17">8.2.4. Related services</a></li>
+<li><a href="#_registering_the_service_14">8.2.3. Registering the Service</a></li>
+<li><a href="#_related_services_19">8.2.4. Related services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_DomainObjectContainer">8.3. <code>DomainObjectContainer</code></a>
@@ -11813,7 +12548,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</ul>
</li>
<li><a href="#_implementation_23">8.3.2. Implementation</a></li>
-<li><a href="#_registering_the_service_14">8.3.3. Registering the Service</a></li>
+<li><a href="#_registering_the_service_15">8.3.3. Registering the Service</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_EventBusService">8.4. <code>EventBusService</code></a>
@@ -11831,7 +12566,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_implementation_spi">8.4.7. Implementation SPI</a></li>
<li><a href="#_rgsvc_api_EventBusService_Configuration">8.4.8. Configuration</a></li>
<li><a href="#_registering_the_services_15">8.4.9. Registering the Services</a></li>
-<li><a href="#_related_services_18">8.4.10. Related Services</a></li>
+<li><a href="#_related_services_20">8.4.10. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_FactoryService">8.5. <code>FactoryService</code></a>
@@ -11839,23 +12574,23 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li>
<TRUNCATED>
[3/3] isis-site git commit: ISIS-1291: updating docs for new
services. Also IsisTransaction now to clears the changed object properties
rather than AuditingService,
otherwise PublisherService would mis-report the metric of number of changed
object prop
Posted by da...@apache.org.
ISIS-1291: updating docs for new services. Also IsisTransaction now to clears the changed object properties rather than AuditingService, otherwise PublisherService would mis-report the metric of number of changed object properties.
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/86d69a8f
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/86d69a8f
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/86d69a8f
Branch: refs/heads/asf-site
Commit: 86d69a8f9cd6dd7df3796499c53f4c6b000d8462
Parents: 3eb5a1d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 15 16:49:12 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 15 16:49:12 2016 +0100
----------------------------------------------------------------------
content/guides/rgsvc.html | 1045 +-
content/guides/rgsvc.pdf | 190986 +++++++++++++++++++++-----------------
2 files changed, 105634 insertions(+), 86397 deletions(-)
----------------------------------------------------------------------