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 2015/11/19 23:42:44 UTC
[3/6] isis git commit: ISIS-915, ISIS-1250, ISIS-1251, ISIS-1252,
ISIS-1254, ISIS-1255: documentation and minor code updates.
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/adocs/documentation/src/main/asciidoc/resources/templates/asciidoc-templates-idea.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/templates/asciidoc-templates-idea.xml b/adocs/documentation/src/main/asciidoc/resources/templates/asciidoc-templates-idea.xml
deleted file mode 100644
index 6e9c8d3..0000000
--- a/adocs/documentation/src/main/asciidoc/resources/templates/asciidoc-templates-idea.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<templateSet group="AsciiDoc">
- <template name="adtbl3" value=".$tableCaption$ [cols="1a,1a,1a", options="header"] |=== | $cell1header$ | $cell2header$ | $cell3header$ | $cell1row1$ | $cell2row1$ | $cell3row1$ | | | |===" description="Table with three columns" toReformat="false" toShortenFQNames="true">
- <variable name="tableCaption" expression="" defaultValue=""Table caption"" alwaysStopAt="true" />
- <variable name="cell1header" expression="" defaultValue=""Header Cell 1"" alwaysStopAt="true" />
- <variable name="cell2header" expression="" defaultValue=""Header Cell 2"" alwaysStopAt="true" />
- <variable name="cell3header" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="cell1row1" expression="" defaultValue=""Row 1 Cell 1"" alwaysStopAt="true" />
- <variable name="cell2row1" expression="" defaultValue=""Row 1 Cell 2"" alwaysStopAt="true" />
- <variable name="cell3row1" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adadmtip" value="[TIP] ==== $END$ ==== " description="Tip admonition" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adadmnote" value="[NOTE] ==== $END$ ==== " description="Note admonition" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adadmimportant" value="[IMPORTANT] ==== $END$ ==== " description="Important admonition" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adadmwarning" value="[WARNING] ==== $END$ ==== " description="Warning admonition" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adimgfile" value="image::{_imagesdir}$INCLUDED$/$FILE$.png[width="$END$$WIDTH$px",link="{_imagesdir}$INCLUDED$/$FILE$.png"]" description="Image link to file" toReformat="false" toShortenFQNames="true">
- <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adimgurl" value="image::$URL$[width="$END$$WIDTH$px",link="$URL$"]" description="Image link to URL" toReformat="false" toShortenFQNames="true">
- <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adlink" value="link:$URL$[$TEXT$]" description="Link to URL" toReformat="false" toShortenFQNames="true">
- <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcjava" value="[source,java] ---- $END$ ---- " description="Source code (java)" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcxml" value="[source,xml] ---- $END$ ---- " description="Source code (XML)" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcother" value="[source,$LANG$] ---- $END$ ---- " description="Source code (None)" toReformat="false" toShortenFQNames="true">
- <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adinclude" value="include::$INCLUDED$.adoc[leveloffset=+1] " description="Include" toReformat="false" toShortenFQNames="true">
- <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adlinkaddons" value="(non-ASF) link:http://isisaddons.org[Isis Addons]" description="Link to Isis Addons" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adlinkaddonsmodule" value="(non-ASF) http://github.com/isisaddons/isis-module-$MODULE$[Isis addons' $MODULE$] module" description="Link to specific Isis Addons module" toReformat="false" toShortenFQNames="true">
- <variable name="MODULE" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adtodo" value="NOTE: TODO" description="TODO note" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adfootnote" value=".footnote:[$END$]" description="Footnote" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adlinkaddonswicket" value="(non-ASF) http://github.com/isisaddons/isis-wicket-$WICKET$[Isis addons' $WICKET$ ] wicket extension" description="Link to specific Isis Addons wicket cpt" toReformat="false" toShortenFQNames="true">
- <variable name="WICKET" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adlinkaddonsapp" value="(non-ASF) http://github.com/isisaddons/isis-app-$APP$[Isis addons' $APP$]" description="Link to specific Isis Addons app" toReformat="false" toShortenFQNames="true" deactivated="true">
- <variable name="APP" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adugsimpleapp" value="xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype]" description="xref to the user guide simpleapp archetype" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adyoutube" value="video::$REFERENCE$[youtube,width="$WIDTH$px",height="$END$$HEIGHT$px"]" description="Link to youtube" toReformat="false" toShortenFQNames="true">
- <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adimgfilec" value=".$CAPTION$ image::{_imagesdir}$INCLUDED$/$FILE$.png[width="$END$$WIDTH$px",link="{_imagesdir}$INCLUDED$/$FILE$.png"]" description="Image link to file with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adimgurlc" value=".$CAPTION$ image::$URL$[width="$END$$WIDTH$px",link="$URL$"]" description="Image link to URL with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcjavac" value="[source,java] .$CAPTION$ ---- $END$ ---- " description="Source code (java) with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcotherc" value="[source,$LANG$] ---- $END$ ---- " description="Source code (None) with caption" toReformat="false" toShortenFQNames="true">
- <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcxmlc" value="[source,xml] .$CAPTION$ ---- $END$ ---- " description="Source code (XML) with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcjavascript" value="[source,javascript] ---- $END$ ---- " description="Source code (Javascript)" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adsrcjavascriptc" value="[source,javascript] .$CAPTION$ ---- $END$ ---- " description="Source code (javascript) with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgmp" value="xref:rg.adoc#_rg_methods_prefixes_manpage-$methodName$[`$methodName$...()`]" description="x-ref to ref guide manpage for method prefix" toReformat="false" toShortenFQNames="true">
- <variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adug1" value="xref:ug.adoc#$chapter$[$DisplayText$]" description="x-ref to user guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgsa" value="xref:rg.adoc#_rg_services-api_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service api" toReformat="false" toShortenFQNames="true">
- <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgmr" value="xref:rg.adoc#_rg_methods_reserved_manpage-$methodName$[`$methodName$()`]" description="x-ref to ref guide manpage for reserved method" toReformat="false" toShortenFQNames="true">
- <variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgss" value="xref:rg.adoc#_rg_services-spi_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service spi" toReformat="false" toShortenFQNames="true">
- <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgcv" value="xref:rg.adoc#_rg_classes_value-types_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class value type" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgcs" value="xref:rg.adoc#_rg_classes_super_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class superclass" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgcu" value="xref:rg.adoc#_rg_classes_utility_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class utility" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adanchany" value="= anchor:$prefix$[]" description="anchor to any" toReformat="false" toShortenFQNames="true">
- <variable name="prefix" expression="" defaultValue="chapter" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgna" value="xref:rg.adoc#_rg_annotations_manpage-$Type$[`@$Type$`]" description="x-ref to ref guide manpage for annotation" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adug2" value="xref:ug.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to user guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adug3" value="xref:ug.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to user guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adxrefany" value="xref:$chapter$[$DisplayText$]" description="x-ref to any" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgnt" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[`@$Type$#$attribute$()`]" description="x-ref to ref guide manpage for annotation's attribute" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adugvw" value="xref:ug.adoc#_ug_wicket-viewer[Wicket viewer]" description="x-ref to user guide wicket viewer" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adugvro" value="xref:ug.adoc#_ug_restfulobjects-viewer[RestfulObjects viewer]" description="x-ref to user guide restfulobjects viewer" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgntx" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[$linkText$]" description="x-ref to ref guide manpage for annotation's attribute, overriding the link text" toReformat="false" toShortenFQNames="true">
- <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="linkText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adwip" value="NOTE: WIP - " description="WIP note" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adyoutubec" value=".$CAPTION$ video::$REFERENCE$[youtube,width="$WIDTH$px",height="$END$$HEIGHT$px"]" description="Link to youtube with caption" toReformat="false" toShortenFQNames="true">
- <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg1" value="xref:rg.adoc#$chapter$[$DisplayText$]" description="x-ref to ref guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg2" value="xref:rg.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to ref guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg3" value="xref:rg.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to ref guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgcfg" value="xref:rg.adoc#_rg_runtime_configuring-core[configuration property]" description="x-ref to ref guide configuration properties section" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adcg" value="xref:cg.adoc#_cg[Contributors' Guide]" description="xref to contributors guide" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg" value="xref:rg.adoc#_rg[Reference Guide]" description="xref to reference guide" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adug" value="xref:ug.adoc#_ug[Users' Guide]" description="xref to user' guide" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adai" value="Apache Isis " description="Apache Isis" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adcg1" value="xref:cg.adoc#_cg_$chapter$[$DisplayText$]" description="x-ref to contributors guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adcg2" value="xref:cg.adoc#_cg_$chapter$_$section$[$DisplayText$]" description="x-ref to contributors guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adtg1" value="xref:tg.adoc#$chapter$[$DisplayText$]" description="x-ref to tutorials level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_tg_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
-</templateSet>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml b/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
new file mode 100644
index 0000000..2c0e28b
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
@@ -0,0 +1,365 @@
+<templateSet group="Isis-AsciiDoc">
+ <template name="adtbl3" value=".$tableCaption$ [cols="1a,1a,1a", options="header"] |=== | $cell1header$ | $cell2header$ | $cell3header$ | $cell1row1$ | $cell2row1$ | $cell3row1$ | | | |===" description="Table with three columns" toReformat="false" toShortenFQNames="true">
+ <variable name="tableCaption" expression="" defaultValue=""Table caption"" alwaysStopAt="true" />
+ <variable name="cell1header" expression="" defaultValue=""Header Cell 1"" alwaysStopAt="true" />
+ <variable name="cell2header" expression="" defaultValue=""Header Cell 2"" alwaysStopAt="true" />
+ <variable name="cell3header" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="cell1row1" expression="" defaultValue=""Row 1 Cell 1"" alwaysStopAt="true" />
+ <variable name="cell2row1" expression="" defaultValue=""Row 1 Cell 2"" alwaysStopAt="true" />
+ <variable name="cell3row1" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adadmtip" value="[TIP] ==== $END$ ==== " description="Tip admonition" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adadmnote" value="[NOTE] ==== $END$ ==== " description="Note admonition" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adadmimportant" value="[IMPORTANT] ==== $END$ ==== " description="Important admonition" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adadmwarning" value="[WARNING] ==== $END$ ==== " description="Warning admonition" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adimgfile" value="image::{_imagesdir}$INCLUDED$/$FILE$.png[width="$END$$WIDTH$px",link="{_imagesdir}$INCLUDED$/$FILE$.png"]" description="Image link to file" toReformat="false" toShortenFQNames="true">
+ <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adimgurl" value="image::$URL$[width="$END$$WIDTH$px",link="$URL$"]" description="Image link to URL" toReformat="false" toShortenFQNames="true">
+ <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adlink" value="link:$URL$[$TEXT$]" description="Link to URL" toReformat="false" toShortenFQNames="true">
+ <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcjava" value="[source,java] ---- $END$ ---- " description="Source code (java)" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcxml" value="[source,xml] ---- $END$ ---- " description="Source code (XML)" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcother" value="[source,$LANG$] ---- $END$ ---- " description="Source code (None)" toReformat="false" toShortenFQNames="true">
+ <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adinclude" value="include::$INCLUDED$.adoc[leveloffset=+1] " description="Include" toReformat="false" toShortenFQNames="true">
+ <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adlinkaddons" value="(non-ASF) link:http://isisaddons.org[Isis Addons]" description="Link to Isis Addons" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adlinkaddonsmodule" value="(non-ASF) http://github.com/isisaddons/isis-module-$MODULE$[Isis addons' $MODULE$] module" description="Link to specific Isis Addons module" toReformat="false" toShortenFQNames="true">
+ <variable name="MODULE" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adtodo" value="NOTE: TODO" description="TODO note" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adfootnote" value=".footnote:[$END$]" description="Footnote" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adlinkaddonswicket" value="(non-ASF) http://github.com/isisaddons/isis-wicket-$WICKET$[Isis addons' $WICKET$ ] wicket extension" description="Link to specific Isis Addons wicket cpt" toReformat="false" toShortenFQNames="true">
+ <variable name="WICKET" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adlinkaddonsapp" value="(non-ASF) http://github.com/isisaddons/isis-app-$APP$[Isis addons' $APP$]" description="Link to specific Isis Addons app" toReformat="false" toShortenFQNames="true" deactivated="true">
+ <variable name="APP" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adugsimpleapp" value="xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype]" description="xref to the user guide simpleapp archetype" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adyoutube" value="video::$REFERENCE$[youtube,width="$WIDTH$px",height="$END$$HEIGHT$px"]" description="Link to youtube" toReformat="false" toShortenFQNames="true">
+ <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adimgfilec" value=".$CAPTION$ image::{_imagesdir}$INCLUDED$/$FILE$.png[width="$END$$WIDTH$px",link="{_imagesdir}$INCLUDED$/$FILE$.png"]" description="Image link to file with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adimgurlc" value=".$CAPTION$ image::$URL$[width="$END$$WIDTH$px",link="$URL$"]" description="Image link to URL with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcjavac" value="[source,java] .$CAPTION$ ---- $END$ ---- " description="Source code (java) with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcotherc" value="[source,$LANG$] ---- $END$ ---- " description="Source code (None) with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcxmlc" value="[source,xml] .$CAPTION$ ---- $END$ ---- " description="Source code (XML) with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcjavascript" value="[source,javascript] ---- $END$ ---- " description="Source code (Javascript)" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adsrcjavascriptc" value="[source,javascript] .$CAPTION$ ---- $END$ ---- " description="Source code (javascript) with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgmp" value="xref:rg.adoc#_rg_methods_prefixes_manpage-$methodName$[`$methodName$...()`]" description="x-ref to ref guide manpage for method prefix" toReformat="false" toShortenFQNames="true">
+ <variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adug1" value="xref:ug.adoc#$chapter$[$DisplayText$]" description="x-ref to user guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgsa" value="xref:rg.adoc#_rg_services-api_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service api" toReformat="false" toShortenFQNames="true">
+ <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgmr" value="xref:rg.adoc#_rg_methods_reserved_manpage-$methodName$[`$methodName$()`]" description="x-ref to ref guide manpage for reserved method" toReformat="false" toShortenFQNames="true">
+ <variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgss" value="xref:rg.adoc#_rg_services-spi_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service spi" toReformat="false" toShortenFQNames="true">
+ <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgcv" value="xref:rg.adoc#_rg_classes_value-types_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class value type" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgcs" value="xref:rg.adoc#_rg_classes_super_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class superclass" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgcu" value="xref:rg.adoc#_rg_classes_utility_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class utility" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adanchany" value="= anchor:$prefix$[]" description="anchor to any" toReformat="false" toShortenFQNames="true">
+ <variable name="prefix" expression="" defaultValue="chapter" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgna" value="xref:rg.adoc#_rg_annotations_manpage-$Type$[`@$Type$`]" description="x-ref to ref guide manpage for annotation" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adug2" value="xref:ug.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to user guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
+ <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adug3" value="xref:ug.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to user guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
+ <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adxrefany" value="xref:$chapter$[$DisplayText$]" description="x-ref to any" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgnt" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[`@$Type$#$attribute$()`]" description="x-ref to ref guide manpage for annotation's attribute" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adugvw" value="xref:ug.adoc#_ug_wicket-viewer[Wicket viewer]" description="x-ref to user guide wicket viewer" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adugvro" value="xref:ug.adoc#_ug_restfulobjects-viewer[RestfulObjects viewer]" description="x-ref to user guide restfulobjects viewer" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgntx" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[$linkText$]" description="x-ref to ref guide manpage for annotation's attribute, overriding the link text" toReformat="false" toShortenFQNames="true">
+ <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="linkText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adwip" value="NOTE: WIP - " description="WIP note" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adyoutubec" value=".$CAPTION$ video::$REFERENCE$[youtube,width="$WIDTH$px",height="$END$$HEIGHT$px"]" description="Link to youtube with caption" toReformat="false" toShortenFQNames="true">
+ <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrg1" value="xref:rg.adoc#$chapter$[$DisplayText$]" description="x-ref to ref guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrg2" value="xref:rg.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to ref guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
+ <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrg3" value="xref:rg.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to ref guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
+ <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrgcfg" value="xref:rg.adoc#_rg_runtime_configuring-core[configuration property]" description="x-ref to ref guide configuration properties section" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adcg" value="xref:cg.adoc#_cg[Contributors' Guide]" description="xref to contributors guide" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adrg" value="xref:rg.adoc#_rg[Reference Guide]" description="xref to reference guide" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adug" value="xref:ug.adoc#_ug[Users' Guide]" description="xref to user' guide" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adai" value="Apache Isis " description="Apache Isis" toReformat="false" toShortenFQNames="true">
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adcg1" value="xref:cg.adoc#_cg_$chapter$[$DisplayText$]" description="x-ref to contributors guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adcg2" value="xref:cg.adoc#_cg_$chapter$_$section$[$DisplayText$]" description="x-ref to contributors guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+ <template name="adtg1" value="xref:tg.adoc#$chapter$[$DisplayText$]" description="x-ref to tutorials level 1 (chapter)" toReformat="false" toShortenFQNames="true">
+ <variable name="chapter" expression="" defaultValue="_tg_" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <context>
+ <option name="AsciiDoc" value="true" />
+ </context>
+ </template>
+</templateSet>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/adocs/template/document.html.erb
----------------------------------------------------------------------
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index b9685f9..3d0ba31 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -170,7 +170,7 @@
}
div#doc-content a.header-link {
- margin-left: -90px;
+ margin-left: -75px;
}
div#doc-content div.sect1 h2 {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
index 2b2b81f..d2d0f1c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
@@ -35,7 +35,7 @@ public abstract class ActionDomainEvent<S> extends AbstractInteractionEvent<S> {
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Action#domainEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.actionDomainEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.actionAnnotation.domainEvent.postForDefault"
* configuration property.
*/
public static class Default extends ActionInteractionEvent<Object> {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
index c431483..3820112 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
@@ -29,7 +29,7 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractInteractionEven
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Collection#domainEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.collectionDomainEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault"
* configuration property.
*/
public static class Default extends CollectionInteractionEvent<Object, Object> {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
index b347b49..6b7cf3b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
@@ -51,7 +51,7 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#cssClassUiEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.cssClassUiEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault"
* configuration property.
*/
public static class Default extends CssClassUiEvent<Object> {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
index 2ed9ed8..0bdee8b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
@@ -49,7 +49,7 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#iconUiEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.iconUiEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault"
* configuration property.
*/
public static class Default extends IconUiEvent<Object> {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
index bc90b2c..a42226f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
@@ -29,7 +29,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractInteractionEvent<
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Property#domainEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.propertyDomainEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault"
* configuration property.
*/
public static class Default extends PropertyInteractionEvent<Object, Object> {
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
index 86b584b..e170077 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
@@ -33,7 +33,7 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#titleUiEvent()} annotation attribute. Whether this
- * raises an event or not depends upon the "isis.services.eventbus.titleUiEvent.postForDefault"
+ * raises an event or not depends upon the "isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault"
* configuration property.
*/
public static class Default extends TitleUiEvent<Object> {
@@ -88,7 +88,7 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
* The title as provided by a subscriber using {@link #setTitle(String)}.
*
* <p>
- * Note that a {@link #getTranslatedTitle()} will be used in preference, if available.
+ * Note that a {@link #getTranslatableTitle()} will be used in preference, if available.
* </p>
*/
public String getTitle() {
@@ -103,26 +103,26 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
}
//endregion
- //region > translatedTitle
- private TranslatableString translatedTitle;
+ //region > translatableTitle
+ private TranslatableString translatableTitle;
/**
- * The translatable (i18n) title as provided by a subscriber using {@link #setTranslatedTitle(TranslatableString)}.
+ * The translatable (i18n) title as provided by a subscriber using {@link #setTranslatableTitle(TranslatableString)}.
*
* <p>
* If a translatable title has been provided then this will be used in preference to any
* {@link #getTitle() non-translatable title}.
* </p>
*/
- public TranslatableString getTranslatedTitle() {
- return translatedTitle;
+ public TranslatableString getTranslatableTitle() {
+ return translatableTitle;
}
/**
* For subscribers to call to provide a translatable (i18n) title for this object.
*/
- public void setTranslatedTitle(final TranslatableString translatedTitle) {
- this.translatedTitle = translatedTitle;
+ public void setTranslatableTitle(final TranslatableString translatableTitle) {
+ this.translatableTitle = translatableTitle;
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index c6374f2..51aaffb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -204,7 +204,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
actionDomainEventFacet.getEventType(),
ActionDomainEvent.Noop.class,
ActionDomainEvent.Default.class,
- "isis.services.eventbus.actionDomainEvent.postForDefault", this.configuration)) {
+ "isis.reflector.facet.actionAnnotation.domainEvent.postForDefault", this.configuration)) {
FacetUtil.addFacet(actionDomainEventFacet);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index cc35eb6..433e208 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -176,7 +176,7 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
collectionDomainEventFacet.getEventType(),
CollectionDomainEvent.Noop.class,
CollectionDomainEvent.Default.class,
- "isis.services.eventbus.collectionDomainEvent.postForDefault", this.configuration)) {
+ "isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault", this.configuration)) {
FacetUtil.addFacet(collectionDomainEventFacet);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index abcfe04..165c1d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -54,7 +54,7 @@ public class CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent ex
cssClassUiEventClass,
CssClassUiEvent.Noop.class,
CssClassUiEvent.Default.class,
- "isis.services.eventbus.cssClassUiEvent.postForDefault",
+ "isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault",
configuration)) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index c53a711..cccd692 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -51,7 +51,7 @@ public class IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent extends Ic
iconUiEventClass,
IconUiEvent.Noop.class,
IconUiEvent.Default.class,
- "isis.services.eventbus.iconUiEvent.postForDefault",
+ "isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault",
configuration)) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index e9810c3..cbdf706 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -55,7 +55,7 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
titleUiEventClass,
TitleUiEvent.Noop.class,
TitleUiEvent.Default.class,
- "isis.services.eventbus.titleUiEvent.postForDefault",
+ "isis.reflector.facet.domainObjectLayoutAnnotation.titleEvent.postForDefault",
configuration)) {
return null;
}
@@ -94,7 +94,7 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
eventBusService.post(titleUiEvent);
- final TranslatableString translatedTitle = titleUiEvent.getTranslatedTitle();
+ final TranslatableString translatedTitle = titleUiEvent.getTranslatableTitle();
if(translatedTitle != null) {
return translatedTitle.translate(translationService, translationContext);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 8b07630..a1d7c16 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -174,7 +174,7 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
propertyDomainEventFacet.getEventType(),
PropertyDomainEvent.Noop.class,
PropertyDomainEvent.Default.class,
- "isis.services.eventbus.propertyDomainEvent.postForDefault",
+ "isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault",
this.configuration)) {
FacetUtil.addFacet(propertyDomainEventFacet);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4b891285/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
index eb801bd..debeaeb 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -114,6 +114,16 @@ isis.reflector.facet.cssClass.patterns=\
delete.*:btn-warning
+#
+# whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
+#
+#isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
+#isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
+#isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
+#isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
+#isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
+#isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
+
#################################################################################
#
# Domain Service configuration