You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/08/13 22:59:17 UTC
[06/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
index d5c4550..3f0fe06 100644
--- a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
+++ b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
@@ -4,8 +4,8 @@
<< /Title (DataNucleus Object Store)
/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:20180812182701+01'00')
-/ModDate (D:20180812182701+01'00')
+/CreationDate (D:20180814004039+02'00')
+/ModDate (D:20180814004039+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugsec/ugsec.html b/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
index a11f989..19b0903 100644
--- a/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
+++ b/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
@@ -1549,16 +1549,16 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<p>Generally speaking your domain objects (or more generally your application) should be agnostic of the user/roles that are interacting with them; applying security permissions is the responsibility of the framework.</p>
</div>
<div class="paragraph">
- <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>DomainObjectContainer</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
+ <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>UserService</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
</div>
<div class="sect2">
- <h3 id="__code_domainobjectcontainer_code_api">6.1. <code>DomainObjectContainer</code> API</h3>
+ <h3 id="__code_userservice_code_api">6.1. <code>UserService</code> API</h3>
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service exposes the following API:</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> service exposes the following API:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = container.getUser();
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = userService.getUser();
<span class="directive">final</span> <span class="predefined-type">List</span><RoleMemento> roles = user.getRoles();
<span class="keyword">for</span> (RoleMemento role : roles) {
<span class="predefined-type">String</span> roleName = role.getName();
@@ -1587,7 +1587,7 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<div class="sect2">
<h3 id="_servlet_api">6.2. Servlet API</h3>
<div class="paragraph">
- <p>On occasion you may find it necessary to reach below Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
+ <p>On occasion you may find it necessary to reach below Apache Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
</div>
<div class="admonitionblock tip">
<table>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
index 00c91b8..3214832 100644
--- a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
+++ b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
@@ -4,8 +4,8 @@
<< /Title (Security)
/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:20180812182709+01'00')
-/ModDate (D:20180812182709+01'00')
+/CreationDate (D:20180814004048+02'00')
+/ModDate (D:20180814004048+02'00')
>>
endobj
2 0 obj
@@ -88,7 +88,7 @@ endobj
>>
endobj
9 0 obj
-<< /Length 20679
+<< /Length 20699
>>
stream
q
@@ -893,7 +893,7 @@ ET
BT
79.9485 400.7359999999997 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -902,7 +902,7 @@ ET
0.200 0.200 0.200 SCN
BT
-190.19850000000002 400.7359999999997 Td
+137.69850000000002 400.7359999999997 Td
/F1.0 10.5 Tf
<20415049> Tj
ET
@@ -913,9 +913,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 400.7359999999997 Td
+159.82624999999996 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -15539,7 +15539,7 @@ endobj
endobj
159 0 obj
<< /Limits [(caching) (wicket-viewer)]
-/Names [(caching) 184 0 R (code-domainobjectcontainer-code-api) 195 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
+/Names [(caching) 184 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-userservice-code-api) 195 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
>>
endobj
160 0 obj
@@ -22512,7 +22512,7 @@ endobj
>>
endobj
192 0 obj
-<< /Length 21260
+<< /Length 21230
>>
stream
q
@@ -22591,7 +22591,7 @@ ET
BT
48.24 678.086 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22600,7 +22600,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.49 678.086 Td
+105.99000000000001 678.086 Td
/F1.0 10.5 Tf
<20415049206f7220796f752063616e207265616368206675727468657220646f776e2074686520737461636b20616e642075736520746865204a454520536572766c6574204150492e> Tj
ET
@@ -22624,7 +22624,7 @@ ET
BT
83.574 638.2460000000001 Td
/F4.0 18 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22633,7 +22633,7 @@ ET
0.200 0.200 0.200 SCN
BT
-272.57399999999996 638.2460000000001 Td
+182.57399999999998 638.2460000000001 Td
/F2.0 18 Tf
<20415049> Tj
ET
@@ -22657,7 +22657,7 @@ ET
BT
69.66 610.2260000000001 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22666,7 +22666,7 @@ ET
0.200 0.200 0.200 SCN
BT
-179.91000000000003 610.2260000000001 Td
+127.41000000000003 610.2260000000001 Td
/F1.0 10.5 Tf
<2073657276696365206578706f7365732074686520666f6c6c6f77696e67204150493a> Tj
ET
@@ -22794,7 +22794,7 @@ ET
BT
196.74 571.5850000000002 Td
/F4.0 11 Tf
-<636f6e7461696e6572> Tj
+<7573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22803,7 +22803,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 571.5850000000002 Td
+257.24 571.5850000000002 Td
/F4.0 11 Tf
<2e> Tj
ET
@@ -22814,7 +22814,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 571.5850000000002 Td
+262.74 571.5850000000002 Td
/F4.0 11 Tf
<67657455736572> Tj
ET
@@ -22825,7 +22825,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 571.5850000000002 Td
+301.24 571.5850000000002 Td
/F4.0 11 Tf
<28> Tj
ET
@@ -22836,7 +22836,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 571.5850000000002 Td
+306.74 571.5850000000002 Td
/F4.0 11 Tf
<29> Tj
ET
@@ -22847,7 +22847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 571.5850000000002 Td
+312.24 571.5850000000002 Td
/F4.0 11 Tf
<3b> Tj
ET
@@ -23574,12 +23574,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.042 Tw
+0.062 Tw
BT
48.24 228.50600000000017 Td
/F1.0 10.5 Tf
-[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f77204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e202046> 40.0390625 <6f72>] TJ
+[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f7720417061636865204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e>] TJ
ET
@@ -23589,12 +23589,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
48.24 212.72600000000017 Td
/F1.0 10.5 Tf
-<6578616d706c652c2074686520286e6f6e2d4153462920> Tj
+[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -23604,10 +23604,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.742 Tw
+0.267 Tw
BT
-169.4402142857143 212.72600000000017 Td
+187.7704927455357 212.72600000000017 Td
/F1.0 10.5 Tf
<496e636f646520506c6174666f726d> Tj
ET
@@ -23619,12 +23619,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
-250.79028571428572 212.72600000000017 Td
+268.64584347098213 212.72600000000017 Td
/F1.0 10.5 Tf
-<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f207468697320696e> Tj
+<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f2074686973> Tj
ET
@@ -23637,7 +23637,7 @@ ET
BT
48.24 196.94600000000017 Td
/F1.0 10.5 Tf
-<6f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
+<696e206f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
ET
0.000 0.000 0.000 SCN
@@ -23863,10 +23863,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_UserService)
>>
/Subtype /Link
-/Rect [69.66 608.7560000000001 179.91000000000003 619.2560000000001]
+/Rect [69.66 608.7560000000001 127.41000000000003 619.2560000000001]
/Type /Annot
>>
endobj
@@ -23880,7 +23880,7 @@ endobj
/URI (http://platform.incode.org)
>>
/Subtype /Link
-/Rect [169.4402142857143 209.66000000000017 250.79028571428572 223.94000000000017]
+/Rect [187.7704927455357 209.66000000000017 268.64584347098213 223.94000000000017]
/Type /Annot
>>
endobj
@@ -30796,7 +30796,7 @@ endobj
endobj
268 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [60.24 397.66999999999973 79.9485 411.9499999999997]
/Type /Annot
@@ -30804,23 +30804,23 @@ endobj
endobj
269 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [79.9485 399.2659999999997 190.19850000000002 409.7659999999997]
+/Rect [79.9485 399.2659999999997 137.69850000000002 409.7659999999997]
/Type /Annot
>>
endobj
270 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [190.19850000000002 397.66999999999973 210.51600000000002 411.9499999999997]
+/Rect [137.69850000000002 397.66999999999973 158.01600000000002 411.9499999999997]
/Type /Annot
>>
endobj
271 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [535.3009999999999 397.66999999999973 547.04 411.9499999999997]
/Type /Annot
@@ -31116,7 +31116,7 @@ endobj
>>
endobj
303 0 obj
-<< /Title <feff0036002e0031002e00200044006f006d00610069006e004f0062006a0065006300740043006f006e007400610069006e006500720020004100500049>
+<< /Title <feff0036002e0031002e0020005500730065007200530065007200760069006300650020004100500049>
/Parent 302 0 R
/Count 0
/Next 304 0 R
@@ -31546,338 +31546,338 @@ xref
0000001250 00000 n
0000001430 00000 n
0000001597 00000 n
-0000022329 00000 n
-0000022954 00000 n
-0000034032 00000 n
-0000034373 00000 n
-0000034417 00000 n
-0000034466 00000 n
-0000034512 00000 n
-0000034685 00000 n
-0000034740 00000 n
-0000034944 00000 n
-0000035144 00000 n
-0000035348 00000 n
-0000035541 00000 n
-0000035745 00000 n
-0000035950 00000 n
-0000036155 00000 n
-0000036359 00000 n
-0000036564 00000 n
-0000036769 00000 n
-0000036973 00000 n
-0000037168 00000 n
-0000037372 00000 n
-0000037569 00000 n
-0000037763 00000 n
-0000037818 00000 n
-0000054479 00000 n
-0000054824 00000 n
-0000054999 00000 n
-0000055186 00000 n
-0000055354 00000 n
-0000055529 00000 n
-0000055765 00000 n
-0000055990 00000 n
-0000056204 00000 n
-0000056374 00000 n
-0000056629 00000 n
-0000056879 00000 n
-0000057072 00000 n
-0000057287 00000 n
-0000057502 00000 n
-0000057751 00000 n
-0000075644 00000 n
-0000075965 00000 n
-0000076009 00000 n
-0000076234 00000 n
-0000076459 00000 n
-0000076514 00000 n
-0000076793 00000 n
-0000077039 00000 n
-0000077214 00000 n
-0000086987 00000 n
-0000087240 00000 n
-0000087296 00000 n
-0000103740 00000 n
-0000104016 00000 n
-0000104208 00000 n
-0000104263 00000 n
-0000104319 00000 n
-0000104526 00000 n
-0000105430 00000 n
-0000105660 00000 n
-0000105866 00000 n
-0000115577 00000 n
-0000115865 00000 n
-0000115909 00000 n
-0000115964 00000 n
-0000116210 00000 n
-0000116458 00000 n
-0000143031 00000 n
-0000143276 00000 n
-0000143547 00000 n
-0000143602 00000 n
-0000155669 00000 n
-0000155908 00000 n
-0000155963 00000 n
-0000156018 00000 n
-0000170801 00000 n
-0000171097 00000 n
-0000171337 00000 n
-0000171393 00000 n
-0000171659 00000 n
-0000171714 00000 n
-0000171926 00000 n
-0000200737 00000 n
-0000203181 00000 n
-0000203448 00000 n
-0000203676 00000 n
-0000203731 00000 n
-0000219937 00000 n
-0000220201 00000 n
-0000220422 00000 n
-0000220633 00000 n
-0000232974 00000 n
-0000233259 00000 n
-0000233317 00000 n
-0000233363 00000 n
-0000233629 00000 n
-0000234855 00000 n
-0000235113 00000 n
-0000327905 00000 n
-0000329944 00000 n
-0000330173 00000 n
-0000416095 00000 n
-0000418134 00000 n
-0000419166 00000 n
-0000419411 00000 n
-0000419639 00000 n
-0000507731 00000 n
-0000509770 00000 n
-0000511132 00000 n
-0000511390 00000 n
-0000511604 00000 n
-0000603390 00000 n
-0000605436 00000 n
-0000606001 00000 n
-0000606246 00000 n
-0000606466 00000 n
-0000703946 00000 n
-0000705985 00000 n
-0000709026 00000 n
-0000709292 00000 n
-0000709513 00000 n
-0000709571 00000 n
-0000709785 00000 n
-0000744057 00000 n
-0000748515 00000 n
-0000748781 00000 n
-0000749039 00000 n
-0000749268 00000 n
-0000789444 00000 n
-0000795216 00000 n
-0000795517 00000 n
-0000795795 00000 n
-0000796028 00000 n
-0000796085 00000 n
-0000796300 00000 n
-0000826013 00000 n
-0000832715 00000 n
-0000832987 00000 n
-0000833219 00000 n
-0000846452 00000 n
-0000846706 00000 n
-0000850492 00000 n
-0000850759 00000 n
-0000851000 00000 n
-0000851300 00000 n
-0000868635 00000 n
-0000868902 00000 n
-0000868948 00000 n
-0000869754 00000 n
-0000870404 00000 n
-0000870635 00000 n
-0000870881 00000 n
-0000875966 00000 n
-0000876207 00000 n
-0000887567 00000 n
-0000887887 00000 n
-0000887933 00000 n
-0000888139 00000 n
-0000888349 00000 n
-0000888564 00000 n
-0000888779 00000 n
-0000888994 00000 n
-0000889198 00000 n
-0000889255 00000 n
-0000899220 00000 n
-0000899476 00000 n
-0000899534 00000 n
-0000940589 00000 n
-0000940830 00000 n
-0000974701 00000 n
-0000974981 00000 n
-0000975227 00000 n
-0000975285 00000 n
-0000975513 00000 n
-0000975570 00000 n
-0000980328 00000 n
-0000980611 00000 n
-0000980824 00000 n
-0000980870 00000 n
-0000981068 00000 n
-0000981293 00000 n
-0000981564 00000 n
-0001002879 00000 n
-0001003167 00000 n
-0001003213 00000 n
-0001003270 00000 n
-0001003508 00000 n
-0001003565 00000 n
-0001003780 00000 n
-0001003994 00000 n
-0001011025 00000 n
-0001011253 00000 n
-0001026469 00000 n
-0001026794 00000 n
-0001026840 00000 n
-0001027020 00000 n
-0001027215 00000 n
-0001027416 00000 n
-0001027473 00000 n
-0001027676 00000 n
-0001027932 00000 n
-0001028164 00000 n
-0001051585 00000 n
-0001051915 00000 n
-0001051961 00000 n
-0001052157 00000 n
-0001052378 00000 n
-0001052617 00000 n
-0001052829 00000 n
-0001052886 00000 n
-0001053092 00000 n
-0001072464 00000 n
-0001072705 00000 n
-0001094248 00000 n
-0001094533 00000 n
-0001094590 00000 n
-0001094959 00000 n
-0001111353 00000 n
-0001111594 00000 n
-0001111724 00000 n
-0001111845 00000 n
-0001111970 00000 n
-0001112096 00000 n
-0001112239 00000 n
-0001112375 00000 n
-0001112534 00000 n
-0001112695 00000 n
-0001112859 00000 n
-0001113016 00000 n
-0001113181 00000 n
-0001113337 00000 n
-0001113501 00000 n
-0001113656 00000 n
-0001113817 00000 n
-0001113981 00000 n
-0001114144 00000 n
-0001114323 00000 n
-0001114493 00000 n
-0001114671 00000 n
-0001114851 00000 n
-0001115034 00000 n
-0001115220 00000 n
-0001115422 00000 n
-0001115634 00000 n
-0001115813 00000 n
-0001116003 00000 n
-0001116195 00000 n
-0001116387 00000 n
-0001116541 00000 n
-0001116707 00000 n
-0001116902 00000 n
-0001117099 00000 n
-0001117262 00000 n
-0001117436 00000 n
-0001117618 00000 n
-0001117800 00000 n
-0001117963 00000 n
-0001118136 00000 n
-0001118306 00000 n
-0001118488 00000 n
-0001118682 00000 n
-0001118863 00000 n
-0001119009 00000 n
-0001119165 00000 n
-0001119339 00000 n
-0001119513 00000 n
-0001119670 00000 n
-0001119829 00000 n
-0001119986 00000 n
-0001120155 00000 n
-0001120442 00000 n
-0001120520 00000 n
-0001120661 00000 n
-0001120853 00000 n
-0001121082 00000 n
-0001121271 00000 n
-0001121456 00000 n
-0001121749 00000 n
-0001122018 00000 n
-0001122298 00000 n
-0001122529 00000 n
-0001122739 00000 n
-0001123044 00000 n
-0001123245 00000 n
-0001123460 00000 n
-0001123701 00000 n
-0001123907 00000 n
-0001124188 00000 n
-0001124442 00000 n
-0001124656 00000 n
-0001124837 00000 n
-0001125108 00000 n
-0001125386 00000 n
-0001125628 00000 n
-0001125814 00000 n
-0001126114 00000 n
-0001126308 00000 n
-0001126538 00000 n
-0001126811 00000 n
-0001135129 00000 n
-0001135345 00000 n
-0001136708 00000 n
-0001137769 00000 n
-0001144948 00000 n
-0001145169 00000 n
-0001146532 00000 n
-0001147613 00000 n
-0001150983 00000 n
-0001151209 00000 n
-0001152572 00000 n
-0001153689 00000 n
-0001154851 00000 n
-0001155067 00000 n
-0001155370 00000 n
-0001156507 00000 n
-0001162240 00000 n
-0001162454 00000 n
-0001163817 00000 n
-0001164869 00000 n
-0001166233 00000 n
-0001166444 00000 n
-0001166759 00000 n
-0001167675 00000 n
-0001169830 00000 n
-0001170044 00000 n
-0001170380 00000 n
+0000022349 00000 n
+0000022974 00000 n
+0000034052 00000 n
+0000034393 00000 n
+0000034437 00000 n
+0000034486 00000 n
+0000034532 00000 n
+0000034705 00000 n
+0000034760 00000 n
+0000034964 00000 n
+0000035164 00000 n
+0000035368 00000 n
+0000035561 00000 n
+0000035765 00000 n
+0000035970 00000 n
+0000036175 00000 n
+0000036379 00000 n
+0000036584 00000 n
+0000036789 00000 n
+0000036993 00000 n
+0000037188 00000 n
+0000037392 00000 n
+0000037589 00000 n
+0000037783 00000 n
+0000037838 00000 n
+0000054499 00000 n
+0000054844 00000 n
+0000055019 00000 n
+0000055206 00000 n
+0000055374 00000 n
+0000055549 00000 n
+0000055785 00000 n
+0000056010 00000 n
+0000056224 00000 n
+0000056394 00000 n
+0000056649 00000 n
+0000056899 00000 n
+0000057092 00000 n
+0000057307 00000 n
+0000057522 00000 n
+0000057771 00000 n
+0000075664 00000 n
+0000075985 00000 n
+0000076029 00000 n
+0000076254 00000 n
+0000076479 00000 n
+0000076534 00000 n
+0000076813 00000 n
+0000077059 00000 n
+0000077234 00000 n
+0000087007 00000 n
+0000087260 00000 n
+0000087316 00000 n
+0000103760 00000 n
+0000104036 00000 n
+0000104228 00000 n
+0000104283 00000 n
+0000104339 00000 n
+0000104546 00000 n
+0000105450 00000 n
+0000105680 00000 n
+0000105886 00000 n
+0000115597 00000 n
+0000115885 00000 n
+0000115929 00000 n
+0000115984 00000 n
+0000116230 00000 n
+0000116478 00000 n
+0000143051 00000 n
+0000143296 00000 n
+0000143567 00000 n
+0000143622 00000 n
+0000155689 00000 n
+0000155928 00000 n
+0000155983 00000 n
+0000156038 00000 n
+0000170821 00000 n
+0000171117 00000 n
+0000171357 00000 n
+0000171413 00000 n
+0000171679 00000 n
+0000171734 00000 n
+0000171946 00000 n
+0000200757 00000 n
+0000203201 00000 n
+0000203468 00000 n
+0000203696 00000 n
+0000203751 00000 n
+0000219957 00000 n
+0000220221 00000 n
+0000220442 00000 n
+0000220653 00000 n
+0000232994 00000 n
+0000233279 00000 n
+0000233337 00000 n
+0000233383 00000 n
+0000233649 00000 n
+0000234875 00000 n
+0000235133 00000 n
+0000327925 00000 n
+0000329964 00000 n
+0000330193 00000 n
+0000416115 00000 n
+0000418154 00000 n
+0000419186 00000 n
+0000419431 00000 n
+0000419659 00000 n
+0000507751 00000 n
+0000509790 00000 n
+0000511152 00000 n
+0000511410 00000 n
+0000511624 00000 n
+0000603410 00000 n
+0000605456 00000 n
+0000606021 00000 n
+0000606266 00000 n
+0000606486 00000 n
+0000703966 00000 n
+0000706005 00000 n
+0000709046 00000 n
+0000709312 00000 n
+0000709533 00000 n
+0000709591 00000 n
+0000709805 00000 n
+0000744077 00000 n
+0000748535 00000 n
+0000748801 00000 n
+0000749059 00000 n
+0000749288 00000 n
+0000789464 00000 n
+0000795236 00000 n
+0000795537 00000 n
+0000795815 00000 n
+0000796048 00000 n
+0000796105 00000 n
+0000796320 00000 n
+0000826033 00000 n
+0000832735 00000 n
+0000833007 00000 n
+0000833239 00000 n
+0000846472 00000 n
+0000846726 00000 n
+0000850512 00000 n
+0000850779 00000 n
+0000851020 00000 n
+0000851320 00000 n
+0000868655 00000 n
+0000868922 00000 n
+0000868968 00000 n
+0000869774 00000 n
+0000870414 00000 n
+0000870645 00000 n
+0000870891 00000 n
+0000875976 00000 n
+0000876217 00000 n
+0000887577 00000 n
+0000887897 00000 n
+0000887943 00000 n
+0000888149 00000 n
+0000888359 00000 n
+0000888574 00000 n
+0000888789 00000 n
+0000889004 00000 n
+0000889208 00000 n
+0000889265 00000 n
+0000899230 00000 n
+0000899486 00000 n
+0000899544 00000 n
+0000940599 00000 n
+0000940840 00000 n
+0000974711 00000 n
+0000974991 00000 n
+0000975237 00000 n
+0000975295 00000 n
+0000975523 00000 n
+0000975580 00000 n
+0000980338 00000 n
+0000980621 00000 n
+0000980834 00000 n
+0000980880 00000 n
+0000981078 00000 n
+0000981303 00000 n
+0000981574 00000 n
+0001002859 00000 n
+0001003147 00000 n
+0001003193 00000 n
+0001003250 00000 n
+0001003478 00000 n
+0001003535 00000 n
+0001003750 00000 n
+0001003964 00000 n
+0001010995 00000 n
+0001011223 00000 n
+0001026439 00000 n
+0001026764 00000 n
+0001026810 00000 n
+0001026990 00000 n
+0001027185 00000 n
+0001027386 00000 n
+0001027443 00000 n
+0001027646 00000 n
+0001027902 00000 n
+0001028134 00000 n
+0001051555 00000 n
+0001051885 00000 n
+0001051931 00000 n
+0001052127 00000 n
+0001052348 00000 n
+0001052587 00000 n
+0001052799 00000 n
+0001052856 00000 n
+0001053062 00000 n
+0001072434 00000 n
+0001072675 00000 n
+0001094218 00000 n
+0001094503 00000 n
+0001094560 00000 n
+0001094929 00000 n
+0001111323 00000 n
+0001111564 00000 n
+0001111694 00000 n
+0001111815 00000 n
+0001111940 00000 n
+0001112066 00000 n
+0001112209 00000 n
+0001112345 00000 n
+0001112504 00000 n
+0001112665 00000 n
+0001112829 00000 n
+0001112986 00000 n
+0001113151 00000 n
+0001113307 00000 n
+0001113471 00000 n
+0001113626 00000 n
+0001113787 00000 n
+0001113951 00000 n
+0001114114 00000 n
+0001114293 00000 n
+0001114463 00000 n
+0001114641 00000 n
+0001114821 00000 n
+0001115004 00000 n
+0001115190 00000 n
+0001115392 00000 n
+0001115604 00000 n
+0001115783 00000 n
+0001115973 00000 n
+0001116165 00000 n
+0001116357 00000 n
+0001116511 00000 n
+0001116677 00000 n
+0001116872 00000 n
+0001117069 00000 n
+0001117232 00000 n
+0001117406 00000 n
+0001117588 00000 n
+0001117770 00000 n
+0001117933 00000 n
+0001118106 00000 n
+0001118266 00000 n
+0001118438 00000 n
+0001118622 00000 n
+0001118793 00000 n
+0001118939 00000 n
+0001119095 00000 n
+0001119269 00000 n
+0001119443 00000 n
+0001119600 00000 n
+0001119759 00000 n
+0001119916 00000 n
+0001120085 00000 n
+0001120372 00000 n
+0001120450 00000 n
+0001120591 00000 n
+0001120783 00000 n
+0001121012 00000 n
+0001121201 00000 n
+0001121386 00000 n
+0001121679 00000 n
+0001121948 00000 n
+0001122228 00000 n
+0001122459 00000 n
+0001122669 00000 n
+0001122974 00000 n
+0001123175 00000 n
+0001123390 00000 n
+0001123631 00000 n
+0001123837 00000 n
+0001124118 00000 n
+0001124372 00000 n
+0001124586 00000 n
+0001124767 00000 n
+0001125038 00000 n
+0001125316 00000 n
+0001125518 00000 n
+0001125704 00000 n
+0001126004 00000 n
+0001126198 00000 n
+0001126428 00000 n
+0001126701 00000 n
+0001135019 00000 n
+0001135235 00000 n
+0001136598 00000 n
+0001137659 00000 n
+0001144838 00000 n
+0001145059 00000 n
+0001146422 00000 n
+0001147503 00000 n
+0001150873 00000 n
+0001151099 00000 n
+0001152462 00000 n
+0001153579 00000 n
+0001154741 00000 n
+0001154957 00000 n
+0001155260 00000 n
+0001156397 00000 n
+0001162130 00000 n
+0001162344 00000 n
+0001163707 00000 n
+0001164759 00000 n
+0001166123 00000 n
+0001166334 00000 n
+0001166649 00000 n
+0001167565 00000 n
+0001169720 00000 n
+0001169934 00000 n
+0001170270 00000 n
trailer
<< /Size 337
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1171518
+1171408
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugtst/ugtst.html b/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
index f7cdf20..2d2bc6b 100644
--- a/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
+++ b/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
@@ -1829,9 +1829,9 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<div class="ulist">
<ul>
<li> <p>for <strong><em>object properties</em></strong> the test can call the getter or setter method</p> </li>
- <li> <p>for <strong><em>object collections</em></strong> the test can call the getter. <br></p>
+ <li> <p>for <strong><em>object collections</em></strong> the test can call the getter.</p>
<div class="paragraph">
- <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.<br></p>
+ <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1856,7 +1856,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<p>What the test can’t call is any of the remaining supporting methods, such as <code>hide…()</code>, <code>disable…()</code> or <code>validate…()</code>. That’s because their value is implied by the exception being thrown.</p>
</div>
<div class="paragraph">
- <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>DomainObjectContainer#titleOf(…)</code> method.</p>
+ <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>TitleService#titleOf(…)</code> method.</p>
</div>
</div>
<div class="sect3">
@@ -2303,7 +2303,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
</div> </td>
</tr>
</tbody>
@@ -2992,7 +2992,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
</ul>
</div>
<div class="paragraph">
- <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_api_ClockService"><code>ClockService</code></a> to a known value.</p>
+ <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a> to a known value.</p>
</div>
<div class="paragraph">
<p>Thereafter the time returned continues to tick forward (as would the real clock) until reset once more.</p>
@@ -3091,7 +3091,7 @@ toDoItem = sudoService.sudo(username,
</div>
</div>
<div class="paragraph">
- <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>DomainObjectContainer</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
+ <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>UserService</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
index 44f1e18..80bfb8a 100644
--- a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
+++ b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
@@ -4,8 +4,8 @@
<< /Title (Testing)
/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:20180812182717+01'00')
-/ModDate (D:20180812182717+01'00')
+/CreationDate (D:20180814004057+02'00')
+/ModDate (D:20180814004057+02'00')
>>
endobj
2 0 obj
@@ -32081,7 +32081,7 @@ endobj
>>
endobj
158 0 obj
-<< /Length 14416
+<< /Length 14408
>>
stream
q
@@ -32387,7 +32387,7 @@ ET
BT
48.24 665.226 Td
/F1.0 10.5 Tf
-[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e2020416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
+[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e20416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -32648,7 +32648,7 @@ ET
BT
66.24000000000001 467.206 Td
/F1.0 10.5 Tf
-<746573742e20205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
+<746573742e205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
ET
0.000 0.000 0.000 SCN
@@ -32657,7 +32657,7 @@ ET
0.694 0.129 0.275 SCN
BT
-252.80400000000003 467.206 Td
+250.08450000000002 467.206 Td
/F6.0 10.5 Tf
<73657455702829> Tj
ET
@@ -32668,7 +32668,7 @@ ET
0.200 0.200 0.200 SCN
BT
-289.55400000000003 467.206 Td
+286.83450000000005 467.206 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -32812,12 +32812,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.322 Tw
+3.787 Tw
BT
66.24000000000001 348.526 Td
/F1.0 10.5 Tf
-[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e20204f746865727769736520616e>] TJ
+[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e204f746865727769736520616e>] TJ
ET
@@ -32838,12 +32838,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.976 Tw
+1.223 Tw
BT
48.24000000000001 304.966 Td
/F1.0 10.5 Tf
-[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e20204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
+[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
ET
@@ -34398,7 +34398,7 @@ endobj
[166 0 R /XYZ 0 106.34356828193836 null]
endobj
171 0 obj
-<< /Length 25788
+<< /Length 25715
>>
stream
q
@@ -34410,7 +34410,7 @@ q
BT
48.24 794.6759999999999 Td
/F1.0 10.5 Tf
-<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e202054686174206d65616e733a> Tj
+<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e2054686174206d65616e733a> Tj
ET
0.000 0.000 0.000 SCN
@@ -34506,7 +34506,7 @@ ET
BT
176.2695 745.116 Td
/F1.0 10.5 Tf
-<2074686520746573742063616e2063616c6c20746865206765747465722e20> Tj
+<2074686520746573742063616e2063616c6c20746865206765747465722e> Tj
ET
0.000 0.000 0.000 SCN
@@ -34514,7 +34514,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
66.24000000000001 717.336 Td
@@ -34529,10 +34529,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-183.49002941176468 717.336 Td
+184.38165625 717.336 Td
/F6.0 10.5 Tf
<616464546f> Tj
ET
@@ -34544,10 +34544,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-209.74002941176468 717.336 Td
+210.63165625 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34559,10 +34559,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-220.24002941176468 717.336 Td
+221.13165625 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34574,10 +34574,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-230.74002941176468 717.336 Td
+231.63165625 717.336 Td
/F1.0 10.5 Tf
<206f7220> Tj
ET
@@ -34589,10 +34589,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-247.45044117647055 717.336 Td
+248.69871874999998 717.336 Td
/F6.0 10.5 Tf
<72656d6f766546726f6d> Tj
ET
@@ -34604,10 +34604,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-299.9504411764706 717.336 Td
+301.19871875 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34619,10 +34619,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-310.4504411764706 717.336 Td
+311.69871875 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34634,12 +34634,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-320.9504411764706 717.336 Td
+322.19871875 717.336 Td
/F1.0 10.5 Tf
-<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e202049742063616e20616c736f> Tj
+<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e2049742063616e20616c736f> Tj
ET
@@ -35070,7 +35070,7 @@ ET
BT
48.24000000000001 578.6560000000002 Td
/F1.0 10.5 Tf
-<6d6574686f642e2020546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
+<6d6574686f642e20546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
ET
0.000 0.000 0.000 SCN
@@ -35258,7 +35258,7 @@ ET
BT
111.24000000000001 535.0960000000002 Td
/F1.0 10.5 Tf
-[<2e202054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
+[<2e2054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35371,7 +35371,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
48.24000000000001 491.5360000000003 Td
@@ -35386,10 +35386,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.173 Tw
+0.063 Tw
BT
-272.4260625 491.5360000000003 Td
+262.4445 491.5360000000003 Td
/F6.0 10.5 Tf
<405469746c65> Tj
ET
@@ -35401,12 +35401,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
-303.9260625 491.5360000000003 Td
+293.9445 491.5360000000003 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e2020496e73746561642c207765207265636f6d6d656e64207468617420796f7572> Tj
+<20616e6e6f746174696f6e2e20496e73746561642c207765207265636f6d6d656e64207468617420796f75722074657374> Tj
ET
@@ -35419,7 +35419,7 @@ ET
BT
48.24000000000001 475.7560000000003 Td
/F1.0 10.5 Tf
-[<7465737420766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
+[<766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35428,9 +35428,9 @@ ET
0.694 0.129 0.275 SCN
BT
-237.84879492187503 475.7560000000003 Td
+217.384294921875 475.7560000000003 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572237469746c654f6628> Tj
+<5469746c6553657276696365237469746c654f6628> Tj
ET
0.000 0.000 0.000 SCN
@@ -35439,7 +35439,7 @@ ET
0.694 0.129 0.275 SCN
BT
-395.348794921875 475.7560000000003 Td
+327.63429492187504 475.7560000000003 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -35450,7 +35450,7 @@ ET
0.694 0.129 0.275 SCN
BT
-405.848794921875 475.7560000000003 Td
+338.13429492187504 475.7560000000003 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -35461,7 +35461,7 @@ ET
0.200 0.200 0.200 SCN
BT
-411.098794921875 475.7560000000003 Td
+343.38429492187504 475.7560000000003 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -36111,7 +36111,7 @@ ET
BT
48.24000000000001 190.39600000000027 Td
/F1.0 10.5 Tf
-[<746f20616e> 20.01953125 <792073756273637269626572732e2020412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
+[<746f20616e> 20.01953125 <792073756273637269626572732e20412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
ET
0.000 0.000 0.000 SCN
@@ -47410,7 +47410,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_Scratchpad)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_Scratchpad)
>>
/Subtype /Link
/Rect [148.91443885216344 453.276 201.41443885216344 463.776]
@@ -68313,7 +68313,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_ClockService)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_ClockService)
>>
/Subtype /Link
/Rect [48.24 484.206 111.24000000000001 494.706]
@@ -68335,7 +68335,7 @@ endobj
>>
endobj
274 0 obj
-<< /Length 54703
+<< /Length 54682
>>
stream
q
@@ -72292,7 +72292,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
48.239999999999995 91.42599999999999 Td
@@ -72307,10 +72307,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-165.97330769230769 91.42599999999999 Td
+162.4891880208333 91.42599999999999 Td
/F6.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -72322,10 +72322,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-223.72330769230769 91.42599999999999 Td
+220.2391880208333 91.42599999999999 Td
/F1.0 10.5 Tf
<2073696d706c792074616c6b7320746f2074686520> Tj
ET
@@ -72337,12 +72337,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-328.60119230769226 91.42599999999999 Td
+320.7619230468749 91.42599999999999 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
@@ -72352,12 +72352,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-438.85119230769226 91.42599999999999 Td
+378.5119230468749 91.42599999999999 Td
/F1.0 10.5 Tf
-<20746f206f76657272696465207468652075736572> Tj
+[<20746f206f766572726964652074686520757365722072657475726e65642062> 20.01953125 <79>] TJ
ET
@@ -72370,7 +72370,7 @@ ET
BT
48.239999999999995 75.64599999999999 Td
/F1.0 10.5 Tf
-[<72657475726e65642062> 20.01953125 <792074686520>] TJ
+<74686520> Tj
ET
0.000 0.000 0.000 SCN
@@ -72379,7 +72379,7 @@ ET
0.694 0.129 0.275 SCN
BT
-129.205294921875 75.64599999999999 Td
+66.92999999999999 75.64599999999999 Td
/F6.0 10.5 Tf
<676574557365722829> Tj
ET
@@ -72390,7 +72390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.455294921875 75.64599999999999 Td
+114.17999999999999 75.64599999999999 Td
/F1.0 10.5 Tf
<204150492e20497420697320706f737369626c6520746f206f7665727269646520626f746820757365727320616e6420726f6c65732e> Tj
ET
@@ -73912,265 +73912,265 @@ xref
0000524070 00000 n
0000524342 00000 n
0000524617 00000 n
-0000539088 00000 n
-0000539376 00000 n
-0000539422 00000 n
-0000539651 00000 n
-0000539852 00000 n
-0000540043 00000 n
-0000554399 00000 n
-0000574319 00000 n
-0000574617 00000 n
-0000574803 00000 n
-0000574860 00000 n
-0000575029 00000 n
-0000575087 00000 n
-0000600930 00000 n
-0000601241 00000 n
-0000601432 00000 n
-0000601489 00000 n
-0000632496 00000 n
-0000632811 00000 n
-0000633035 00000 n
-0000633093 00000 n
-0000633332 00000 n
-0000633571 00000 n
-0000652273 00000 n
-0000652540 00000 n
-0000652765 00000 n
-0000653015 00000 n
-0000668784 00000 n
-0000669104 00000 n
-0000669150 00000 n
-0000669370 00000 n
-0000669599 00000 n
-0000669793 00000 n
-0000669850 00000 n
-0000670419 00000 n
-0000670634 00000 n
-0000670868 00000 n
-0000671096 00000 n
-0000671333 00000 n
-0000671391 00000 n
-0000704326 00000 n
-0000704585 00000 n
-0000704823 00000 n
-0000737227 00000 n
-0000737513 00000 n
-0000737751 00000 n
-0000768989 00000 n
-0000769328 00000 n
-0000769536 00000 n
-0000769805 00000 n
-0000770096 00000 n
-0000770327 00000 n
-0000770558 00000 n
-0000770616 00000 n
-0000770851 00000 n
-0000791058 00000 n
-0000791286 00000 n
-0000806264 00000 n
-0000806557 00000 n
-0000806603 00000 n
-0000806818 00000 n
-0000807093 00000 n
-0000833481 00000 n
-0000833770 00000 n
-0000833816 00000 n
-0000833873 00000 n
-0000834096 00000 n
-0000834341 00000 n
-0000834579 00000 n
-0000838807 00000 n
-0000839087 00000 n
-0000839309 00000 n
-0000887537 00000 n
-0000890754 00000 n
-0000890982 00000 n
-0000931560 00000 n
-0000934777 00000 n
-0000935652 00000 n
-0000935897 00000 n
-0000936091 00000 n
-0001001866 00000 n
-0001005083 00000 n
-0001014228 00000 n
-0001014507 00000 n
-0001014706 00000 n
-0001014945 00000 n
-0001031846 00000 n
-0001032105 00000 n
-0001032151 00000 n
-0001032388 00000 n
-0001094778 00000 n
-0001095051 00000 n
-0001095264 00000 n
-0001102451 00000 n
-0001102757 00000 n
-0001148924 00000 n
-0001149160 00000 n
-0001149218 00000 n
-0001149467 00000 n
-0001184272 00000 n
-0001184527 00000 n
-0001184573 00000 n
-0001195824 00000 n
-0001196070 00000 n
-0001196283 00000 n
-0001226047 00000 n
-0001226275 00000 n
-0001262963 00000 n
-0001263205 00000 n
-0001279691 00000 n
-0001279966 00000 n
-0001280168 00000 n
-0001280213 00000 n
+0000539080 00000 n
+0000539368 00000 n
+0000539414 00000 n
+0000539643 00000 n
+0000539844 00000 n
+0000540035 00000 n
+0000554391 00000 n
+0000574311 00000 n
+0000574609 00000 n
+0000574795 00000 n
+0000574852 00000 n
+0000575021 00000 n
+0000575079 00000 n
+0000600849 00000 n
+0000601160 00000 n
+0000601351 00000 n
+0000601408 00000 n
+0000632415 00000 n
+0000632730 00000 n
+0000632954 00000 n
+0000633012 00000 n
+0000633251 00000 n
+0000633490 00000 n
+0000652192 00000 n
+0000652459 00000 n
+0000652684 00000 n
+0000652934 00000 n
+0000668703 00000 n
+0000669023 00000 n
+0000669069 00000 n
+0000669289 00000 n
+0000669518 00000 n
+0000669712 00000 n
+0000669769 00000 n
+0000670338 00000 n
+0000670553 00000 n
+0000670787 00000 n
+0000671015 00000 n
+0000671252 00000 n
+0000671310 00000 n
+0000704245 00000 n
+0000704504 00000 n
+0000704742 00000 n
+0000737146 00000 n
+0000737432 00000 n
+0000737670 00000 n
+0000768908 00000 n
+0000769247 00000 n
+0000769467 00000 n
+0000769736 00000 n
+0000770027 00000 n
+0000770258 00000 n
+0000770489 00000 n
+0000770547 00000 n
+0000770782 00000 n
+0000790989 00000 n
+0000791217 00000 n
+0000806195 00000 n
+0000806488 00000 n
+0000806534 00000 n
+0000806749 00000 n
+0000807024 00000 n
+0000833412 00000 n
+0000833701 00000 n
+0000833747 00000 n
+0000833804 00000 n
+0000834027 00000 n
+0000834272 00000 n
+0000834510 00000 n
+0000838738 00000 n
+0000839018 00000 n
+0000839240 00000 n
+0000887468 00000 n
+0000890685 00000 n
+0000890913 00000 n
+0000931491 00000 n
+0000934708 00000 n
+0000935583 00000 n
+0000935828 00000 n
+0000936022 00000 n
+0001001797 00000 n
+0001005014 00000 n
+0001014159 00000 n
+0001014438 00000 n
+0001014637 00000 n
+0001014876 00000 n
+0001031777 00000 n
+0001032036 00000 n
+0001032082 00000 n
+0001032319 00000 n
+0001094709 00000 n
+0001094982 00000 n
+0001095195 00000 n
+0001102382 00000 n
+0001102688 00000 n
+0001148855 00000 n
+0001149091 00000 n
+0001149149 00000 n
+0001149398 00000 n
+0001184203 00000 n
+0001184458 00000 n
+0001184504 00000 n
+0001195755 00000 n
+0001196001 00000 n
+0001196214 00000 n
+0001225978 00000 n
+0001226206 00000 n
+0001262894 00000 n
+0001263136 00000 n
+0001279622 00000 n
+0001279897 00000 n
+0001280099 00000 n
+0001280144 00000 n
+0001280353 00000 n
0001280410 00000 n
-0001280467 00000 n
-0001280691 00000 n
-0001335449 00000 n
-0001335704 00000 n
-0001335831 00000 n
-0001335952 00000 n
-0001336077 00000 n
-0001336203 00000 n
-0001336342 00000 n
-0001336482 00000 n
-0001336641 00000 n
-0001336791 00000 n
-0001336938 00000 n
-0001337087 00000 n
-0001337247 00000 n
-0001337420 00000 n
-0001337593 00000 n
-0001337755 00000 n
-0001337920 00000 n
-0001338076 00000 n
-0001338225 00000 n
-0001338376 00000 n
-0001338539 00000 n
-0001338693 00000 n
-0001338845 00000 n
-0001338990 00000 n
-0001339148 00000 n
-0001339299 00000 n
-0001339466 00000 n
-0001339626 00000 n
-0001339807 00000 n
-0001339982 00000 n
-0001340158 00000 n
-0001340336 00000 n
-0001340529 00000 n
-0001340726 00000 n
-0001340913 00000 n
-0001341102 00000 n
-0001341273 00000 n
-0001341444 00000 n
-0001341630 00000 n
-0001341816 00000 n
-0001342001 00000 n
-0001342186 00000 n
-0001342370 00000 n
-0001342556 00000 n
-0001342749 00000 n
-0001342944 00000 n
-0001343131 00000 n
-0001343318 00000 n
-0001343507 00000 n
-0001343698 00000 n
-0001343868 00000 n
-0001344038 00000 n
-0001344220 00000 n
-0001344402 00000 n
-0001344589 00000 n
-0001344776 00000 n
-0001344962 00000 n
-0001345150 00000 n
-0001345308 00000 n
-0001345477 00000 n
-0001345650 00000 n
-0001345833 00000 n
-0001346013 00000 n
-0001346204 00000 n
-0001346373 00000 n
-0001346555 00000 n
-0001346735 00000 n
+0001280634 00000 n
+0001335371 00000 n
+0001335626 00000 n
+0001335753 00000 n
+0001335874 00000 n
+0001335999 00000 n
+0001336125 00000 n
+0001336264 00000 n
+0001336404 00000 n
+0001336563 00000 n
+0001336713 00000 n
+0001336860 00000 n
+0001337009 00000 n
+0001337169 00000 n
+0001337342 00000 n
+0001337515 00000 n
+0001337677 00000 n
+0001337842 00000 n
+0001337998 00000 n
+0001338147 00000 n
+0001338298 00000 n
+0001338461 00000 n
+0001338615 00000 n
+0001338767 00000 n
+0001338912 00000 n
+0001339070 00000 n
+0001339221 00000 n
+0001339388 00000 n
+0001339548 00000 n
+0001339729 00000 n
+0001339904 00000 n
+0001340080 00000 n
+0001340258 00000 n
+0001340451 00000 n
+0001340648 00000 n
+0001340835 00000 n
+0001341024 00000 n
+0001341195 00000 n
+0001341366 00000 n
+0001341552 00000 n
+0001341738 00000 n
+0001341923 00000 n
+0001342108 00000 n
+0001342292 00000 n
+0001342478 00000 n
+0001342671 00000 n
+0001342866 00000 n
+0001343053 00000 n
+0001343240 00000 n
+0001343429 00000 n
+0001343620 00000 n
+0001343790 00000 n
+0001343960 00000 n
+0001344142 00000 n
+0001344324 00000 n
+0001344511 00000 n
+0001344698 00000 n
+0001344884 00000 n
+0001345072 00000 n
+0001345230 00000 n
+0001345399 00000 n
+0001345572 00000 n
+0001345755 00000 n
+0001345935 00000 n
+0001346126 00000 n
+0001346295 00000 n
+0001346477 00000 n
+0001346657 00000 n
+0001346944 00000 n
0001347022 00000 n
-0001347100 00000 n
-0001347237 00000 n
-0001347429 00000 n
-0001347654 00000 n
-0001347829 00000 n
-0001348058 00000 n
-0001348299 00000 n
-0001348551 00000 n
-0001348823 00000 n
-0001349059 00000 n
-0001349263 00000 n
-0001349491 00000 n
-0001349671 00000 n
-0001349872 00000 n
-0001350137 00000 n
-0001350334 00000 n
-0001350553 00000 n
-0001350774 00000 n
-0001350981 00000 n
-0001351275 00000 n
-0001351469 00000 n
-0001351666 00000 n
-0001351867 00000 n
-0001352119 00000 n
-0001352324 00000 n
-0001352543 00000 n
-0001352805 00000 n
-0001352995 00000 n
-0001353224 00000 n
-0001353443 00000 n
-0001353687 00000 n
-0001353870 00000 n
-0001354098 00000 n
-0001354284 00000 n
-0001354673 00000 n
-0001363714 00000 n
-0001363930 00000 n
-0001365293 00000 n
-0001366348 00000 n
-0001373649 00000 n
-0001373870 00000 n
-0001375233 00000 n
-0001376316 00000 n
-0001377644 00000 n
-0001377855 00000 n
-0001378169 00000 n
-0001379084 00000 n
-0001383225 00000 n
-0001383455 00000 n
-0001384818 00000 n
-0001385935 00000 n
-0001390115 00000 n
-0001390341 00000 n
-0001391704 00000 n
-0001392807 00000 n
-0001398618 00000 n
-0001398832 00000 n
-0001400195 00000 n
-0001401246 00000 n
-0001402641 00000 n
-0001402859 00000 n
-0001404222 00000 n
-0001405361 00000 n
-0001407719 00000 n
-0001407933 00000 n
-0001408275 00000 n
-0001409413 00000 n
-0001410576 00000 n
-0001410792 00000 n
-0001411095 00000 n
+0001347159 00000 n
+0001347351 00000 n
+0001347576 00000 n
+0001347751 00000 n
+0001347980 00000 n
+0001348221 00000 n
+0001348473 00000 n
+0001348745 00000 n
+0001348981 00000 n
+0001349185 00000 n
+0001349413 00000 n
+0001349593 00000 n
+0001349794 00000 n
+0001350059 00000 n
+0001350256 00000 n
+0001350475 00000 n
+0001350696 00000 n
+0001350903 00000 n
+0001351197 00000 n
+0001351391 00000 n
+0001351588 00000 n
+0001351789 00000 n
+0001352041 00000 n
+0001352246 00000 n
+0001352465 00000 n
+0001352727 00000 n
+0001352917 00000 n
+0001353146 00000 n
+0001353365 00000 n
+0001353609 00000 n
+0001353792 00000 n
+0001354020 00000 n
+0001354206 00000 n
+0001354595 00000 n
+0001363636 00000 n
+0001363852 00000 n
+0001365215 00000 n
+0001366270 00000 n
+0001373571 00000 n
+0001373792 00000 n
+0001375155 00000 n
+0001376238 00000 n
+0001377566 00000 n
+0001377777 00000 n
+0001378091 00000 n
+0001379006 00000 n
+0001383147 00000 n
+0001383377 00000 n
+0001384740 00000 n
+0001385857 00000 n
+0001390037 00000 n
+0001390263 00000 n
+0001391626 00000 n
+0001392729 00000 n
+0001398540 00000 n
+0001398754 00000 n
+0001400117 00000 n
+0001401168 00000 n
+0001402563 00000 n
+0001402781 00000 n
+0001404144 00000 n
+0001405283 00000 n
+0001407641 00000 n
+0001407855 00000 n
+0001408197 00000 n
+0001409335 00000 n
+0001410498 00000 n
+0001410714 00000 n
+0001411017 00000 n
trailer
<< /Size 413
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1412232
+1412154
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
index a47fc02..e402eae 100644
--- a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
+++ b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
@@ -4,8 +4,8 @@
<< /Title (Restful Objects Viewer)
/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:20180812182730+01'00')
-/ModDate (D:20180812182730+01'00')
+/CreationDate (D:20180814004113+02'00')
+/ModDate (D:20180814004113+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugvw/ugvw.html b/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
index ba9aaab..5af50cf 100644
--- a/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
+++ b/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
@@ -1439,7 +1439,16 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_other_annotations">3.1.4. Other Annotations</h4>
<div class="paragraph">
- <p>All the layout annotations (eg <code>@Regex</code> and <code>@Named</code>) have been deprecated, instead replaced by the various <code>XxxLayout</code> annotations: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a>, <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a>, <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p>Layout semantics can also be specified using the various <code>XxxLayout</code> annotations:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>for domain services: <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a></p> </li>
+ <li> <p>for domain objects: <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p> </li>
+ <li> <p>for actions: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p> </li>
+ <li> <p>for properties: <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p> </li>
+ <li> <p>for collections: <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a></p> </li>
+ </ul>
</div>
</div>
</div>