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 2017/09/08 19:06:26 UTC
isis git commit: ISIS-1712: corrects some documentation is all.
Repository: isis
Updated Branches:
refs/heads/master 27023a5bb -> 258a9e9fc
ISIS-1712: corrects some documentation is all.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/258a9e9f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/258a9e9f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/258a9e9f
Branch: refs/heads/master
Commit: 258a9e9fc6c0ecf1ff0810667dc5931d3588a879
Parents: 27023a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 8 20:05:57 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 8 20:06:19 2017 +0100
----------------------------------------------------------------------
.../asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc | 4 ++--
.../domainapp/application/manifest/isis.properties | 12 +++++++++++-
.../simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini | 10 +++++-----
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/258a9e9f/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
index daeea64..2a9bf6b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
@@ -212,7 +212,7 @@ Lazy initialization can speed up bootstrapping, useful while developing and runn
|`isis.services.` +
`command.` +
`actions`
-| `all`, `ignoreSafe`, `none` (`all`)
+| `all`, `ignoreSafe`, `none` (`none`)
|Whether action invocations should be automatically reified into commands (for actions annotated with xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action(command=CommandReification.AS_CONFIGURED)`]. +
`ignoreQueryOnly` is an alias for `ignoreSafe`.
@@ -220,7 +220,7 @@ Lazy initialization can speed up bootstrapping, useful while developing and runn
|`isis.services.` +
`command.` +
`properties`
-| `all`, `none` (`all`)
+| `all`, `none` (`none`)
|(Whether property edits should be automatically reified into commands (for properties annotated with xref:../rgant/rgant.adoc#_rgant-Property_command[`@Property(command=CommandReification.AS_CONFIGURED)`]. +
http://git-wip-us.apache.org/repos/asf/isis/blob/258a9e9f/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
index 18a429e..a298f40 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
@@ -260,7 +260,7 @@ isis.reflector.facet.cssClass.patterns=\
#
# Whether changes to objects should be audited; if not set, defaults to "none"
# - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
-# - if set to "all", can explicitly disable using @Object(auditing=Auditing.DISABLED)
+# - if set to "all", can explicitly disable using @DomainObject(auditing=Auditing.DISABLED)
#
#isis.services.audit.objects=all|none
isis.services.audit.objects=all
@@ -276,6 +276,16 @@ isis.services.command.actions=ignoreSafe
#
+# Whether property edits should be reified into commands; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @Property(command=CommandReification.ENABLED)
+# - if set to "all", can explicitly disable using @Property(command=CommandReification.DISABLED)
+#
+#isis.services.command.properties=all|none
+isis.services.command.properties=all
+
+
+
+#
# Whether changes to objects should be published; if not set, defaults to "none"
# - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
# - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
http://git-wip-us.apache.org/repos/asf/isis/blob/258a9e9f/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini
index 971ae69..019f356 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -43,9 +43,9 @@ ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
# DEMOS: self-install_role
ldapRealm.permissionsByRole=\
- user_role = *:ToDoItemsJdo:*:*,\
- *:ToDoItem:*:*; \
- self-install_role = *:ToDoItemsFixturesService:install:* ; \
+ user_role = *:SimpleObjectMenu:*:*,\
+ *:SimpleObject:*:*; \
+ self-install_role = *:FixtureScriptsDefault:*:* ; \
admin_role = *
# to use ldap...
@@ -87,7 +87,7 @@ guest = guest, user_role
# role = perm1, perm2, perm3, ...
# perm in format: packageName:className:memberName:r,w
-user_role = *:SimpleObjects:*:*,\
+user_role = *:SimpleObjectMenu:*:*,\
*:SimpleObject:*:*
-self-install_role = *:DomainAppFixtureService:*:*
+self-install_role = *:FixtureScriptsDefault:*:*
admin_role = *