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/06/29 08:19:59 UTC
[7/8] isis git commit: ISIS-1133: converting "Isis" to "Apache Isis"
in the docs.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_prefixes_manpage-validateRemoveFrom.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_prefixes_manpage-validateRemoveFrom.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_prefixes_manpage-validateRemoveFrom.adoc
index 254de8d..e3532a5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_prefixes_manpage-validateRemoveFrom.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_prefixes_manpage-validateRemoveFrom.adoc
@@ -22,7 +22,7 @@ The signature of the supporting method for a collection with element type `E` is
public String validateRemoveFromXxx(E element) { ... }
----
-where the returned string is the reason the collection modification invocation is vetoed (or `null` if not vetoed). Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that reasons can be internationalized if required.
+where the returned string is the reason the collection modification invocation is vetoed (or `null` if not vetoed). Apache Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that reasons can be internationalized if required.
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-disable.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-disable.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-disable.adoc
index acf457d..45bac0c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-disable.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-disable.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-One use case that Isis supports is that of a domain object with a lifecycle whereby at some stage it should become immutable: all its properties/collections should be disabled, and/or its actions become not invokable.
+One use case that Apache Isis supports is that of a domain object with a lifecycle whereby at some stage it should become immutable: all its properties/collections should be disabled, and/or its actions become not invokable.
It would be painful to have to write a separate xref:rg.adoc#_rg_methods_prefixes_manpage-disable[`disable...()`] method for each and every member, so instead Isis allows a single `disable...(...)` method to be implemented that is applied to all members.
@@ -18,7 +18,7 @@ public String disable(Identifier.Type identifierType) { ... }
where `Identifier.Type` is part of the Isis applib (nested static class of `o.a.i.applib.Identifier`) to distinguish between an interaction with an action, a property or an action.
-Note that Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that the returned reason can also be internationalized.
+Note that Apache Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that the returned reason can also be internationalized.
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-hide.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-hide.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-hide.adoc
index 594005c..423699a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-hide.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-hide.adoc
@@ -6,7 +6,7 @@
-One use case that Isis supports is that of a domain object with a lifecycle whereby at some stage some number of the object's members should be hidden. For example, for an object that at some stage is logically immutable, we might want to make all its properties/collections unmodifiable and hide all its actions.
+One use case that Apache Isis supports is that of a domain object with a lifecycle whereby at some stage some number of the object's members should be hidden. For example, for an object that at some stage is logically immutable, we might want to make all its properties/collections unmodifiable and hide all its actions.
While we could write a separate xref:rg.adoc#_rg_methods_prefixes_manpage-hide[`hide...()`] method for each and every action, this could become painful. So instead Isis allows a single `hide...(...)` method to be implemented that is applied to all members.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-title.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-title.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-title.adoc
index fc3793d..ac0535f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-title.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-title.adoc
@@ -8,7 +8,7 @@
Every object is represented by a title. This appears both as a main header for the object when viewed as well as being used as a hyperlink within properties and collections. It therefore must contain enough information for the end-user to distinguish the object from any others.
-This is most commonly done by including some unique key within the title, for example a customer's SSN, or an order number, and so forth. However note that Isis itself does _not_ require the title to be unique; it is merely recommended in most cases.
+This is most commonly done by including some unique key within the title, for example a customer's SSN, or an order number, and so forth. However note that Apache Isis itself does _not_ require the title to be unique; it is merely recommended in most cases.
An object's title can be constructed in various ways, but the most flexible is to use the `title()` method. The signature of this method is usually:
@@ -17,7 +17,7 @@ An object's title can be constructed in various ways, but the most flexible is t
public String title() { ... }
----
-Note that Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that titles can also be internationalized.
+Note that Apache Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that titles can also be internationalized.
For example, the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] uses this technique to add an overlay for todo items that have been completed:
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-validate.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-validate.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-validate.adoc
index 3f50754..07bb1f7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-validate.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_methods_reserved_manpage-validate.adoc
@@ -24,4 +24,4 @@ public String validate() { ... }
where the returned string is the reason that the invocation is vetoed.
-Note that Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that the returned reason can also be internationalized.
+Note that Apache Isis' xref:ug.adoc#_ug_more-advanced_i18n[i18n support] extends this so that the returned reason can also be internationalized.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api.adoc
index 1e9b436..c45b0d2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api.adoc
@@ -5,16 +5,16 @@
:_imagesdir: images/
-Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service as an annotated field and Isis will inject the service into your object. These services' API are all defined in Isis' applib (`o.a.i.core:isis-core-applib` module); this minimizes the coupling between your code and Isis. It also allows you to easily mock out these services in your unit tests.
+Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service as an annotated field and Apache Isis will inject the service into your object. These services' API are all defined in Apache Isis' applib (`o.a.i.core:isis-core-applib` module); this minimizes the coupling between your code and Apache Isis. It also allows you to easily mock out these services in your unit tests.
[NOTE]
====
-In addition there are a number of domain services that constitute an SPI; if present they are used by Isis itself rather than by your domain objects. A good example of this is the xref:rg.adoc#_rg_services-spi_manpage-AuditingService[`AuditingService3`] service. The SPI services are covered in the xref:rg.adoc#_rg_services-spi[Domain Services (SPI) chapter].
+In addition there are a number of domain services that constitute an SPI; if present they are used by Apache Isis itself rather than by your domain objects. A good example of this is the xref:rg.adoc#_rg_services-spi_manpage-AuditingService[`AuditingService3`] service. The SPI services are covered in the xref:rg.adoc#_rg_services-spi[Domain Services (SPI) chapter].
====
-The table below summarizes all the APIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes all the APIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
.Domain Services
[cols="3,3a,3a,3a", options="header"]
@@ -117,7 +117,7 @@ xref:rg.adoc#_rg_services-spi_manpage-CommandService[`CommandService`] for persi
|xref:rg.adoc#_rg_services-api_manpage-EventBusService[`o.a.i.applib.` +
`services.eventbus` +
`EventBusService`]
-|Programmatically post events to the internal event bus. Also used by Isis itself to broadcast domain events:
+|Programmatically post events to the internal event bus. Also used by Apache Isis itself to broadcast domain events:
* xref:rg.adoc#_rg_annotations_manpage-Action_domainEvent[`Action#domainEvent()`]
* xref:rg.adoc#_rg_annotations_manpage-Property_domainEvent[`Property#domainEvent()`]
@@ -161,7 +161,7 @@ xref:rg.adoc#_rg_services-spi_manpage-CommandService[`CommandService`] for persi
|xref:rg.adoc#_rg_services-api_manpage-MetaModelService[`o.a.i.applib.` +
`services.metamodel` +
`MetaModelService`]
-|Access to certain information from the Isis metamodel.
+|Access to certain information from the Apache Isis metamodel.
|`MetaModelServiceDefault` +
``o.a.i.core`` +
``isis-core-metamodel``
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ActionInvocationContext.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ActionInvocationContext.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ActionInvocationContext.adoc
index e7c7119..1f57502 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ActionInvocationContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ActionInvocationContext.adoc
@@ -35,7 +35,7 @@ public static class ActionInvocationContext {
== Usage
-For actions that are void or that return null, Isis will return to the list once executed. But for bulk actions that are non-void, Isis will render the returned object/value from the last object invoked (and simply discards the object/value of all actions except the last).
+For actions that are void or that return null, Apache Isis will return to the list once executed. But for bulk actions that are non-void, Apache Isis will render the returned object/value from the last object invoked (and simply discards the object/value of all actions except the last).
One idiom is for the domain objects to also use the xref:rg.adoc#_rg_services-api_manpage-Scratchpad[`Scratchpad`] service to share information, for example to aggregate values. The `ActionInvocationContext#isLast()` method can then be used to determine if all the information has been gathered, and then do something with it (eg derive variance across a range of values, render a graph etc).
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BackgroundService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BackgroundService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BackgroundService.adoc
index 7af9a1f..35a3238 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BackgroundService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BackgroundService.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-The `BackgroundService`, and the companion xref:rg.adoc#_rg_services-spi_manpage-BackgroundCommandService[`BackgroundCommandService`] SPI service (used by Isis itself), enable action invocations to be persisted such that they may be invoked in the background.
+The `BackgroundService`, and the companion xref:rg.adoc#_rg_services-spi_manpage-BackgroundCommandService[`BackgroundCommandService`] SPI service (used by Apache Isis itself), enable action invocations to be persisted such that they may be invoked in the background.
The `BackgroundService` is responsible for capturing a memento representing the action invocation in a typesafe way, and persisting it rather than executing it directly.
@@ -50,7 +50,7 @@ public void submitCustomerInvoices() {
This will create a bunch of background commands executing the `submitInvoice()` action for each of the customers returned from the customer repository.
-The action method invoked must be part of the Isis metamodel, which is to say it must be public, accept only scalar arguments, and must not be annotated with xref:rg.adoc#_rg_annotations_manpage-Programmatic[`@Programmatic`] or `@Ignore`. However, it may be annotated with xref:rg.adoc#_rg_annotations_manpage-Action_hidden[`@Action#hidden()`] or xref:rg.adoc#_rg_annotations_manpage-ActionLayout_hidden[`@ActionLayout#hidden()`] and it will still be invoked.
+The action method invoked must be part of the Apache Isis metamodel, which is to say it must be public, accept only scalar arguments, and must not be annotated with xref:rg.adoc#_rg_annotations_manpage-Programmatic[`@Programmatic`] or `@Ignore`. However, it may be annotated with xref:rg.adoc#_rg_annotations_manpage-Action_hidden[`@Action#hidden()`] or xref:rg.adoc#_rg_annotations_manpage-ActionLayout_hidden[`@ActionLayout#hidden()`] and it will still be invoked.
In fact, when invoked by the background service, no business rules (hidden, disabled, validation) are enforced; the action method must take responsibility for performing appropriate validation and error checking.
@@ -100,7 +100,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `BackgroundService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `BackgroundService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BookmarkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BookmarkService.adoc
index d56a2b4..738ee4c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-BookmarkService.adoc
@@ -16,7 +16,7 @@ could correspond to a `Bookmark` with a string representation of `custmgmt.Custo
[NOTE]
====
-A `Bookmark` is little more than an API equivalent of Isis' internal `Oid` (object identifier). Nevertheless, the ability to uniquely address _any_ domain object within an Isis system -- to in effect provide a URN -- is immensely useful.
+A `Bookmark` is little more than an API equivalent of Apache Isis' internal `Oid` (object identifier). Nevertheless, the ability to uniquely address _any_ domain object within an Apache Isis system -- to in effect provide a URN -- is immensely useful.
For example, a `Bookmark` could be converted into a barcode, and then this used for automated scanning of correspondence from a customer.
====
@@ -111,7 +111,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `BookmarkService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `BookmarkService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ClockService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ClockService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ClockService.adoc
index 48391a8..21f1c86 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ClockService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ClockService.adoc
@@ -13,7 +13,7 @@ However, such date/time related functionality can quickly complicate automated t
Even disregarding testing, there may be a requirement to ensure that date/times are obtained from an NNTP server (rather than the system PC). While instantiating a `java.util.Date` to current the current time is painless enough, we would not want complex technical logic for querying an NNTP server spread around domain logic code.
-Therefore it's common to provide a domain service whose responsibility is to provide the current time. This service can be injected into any domain object (and can be mocked out for unit testing). Isis provides such a facade through the `ClockService`.
+Therefore it's common to provide a domain service whose responsibility is to provide the current time. This service can be injected into any domain object (and can be mocked out for unit testing). Apache Isis provides such a facade through the `ClockService`.
@@ -60,7 +60,7 @@ The `FixtureClock` will behave as the system clock, unless its is explicitly set
Suppose you want (as discussed in the introduction to this service) to use a clock that delegates to NNTP. For most domain services this would amount to implementing the appropriate service and registering in `isis.properties` so that it is used in preference to any implementations provided by default by the framework.
-In the case of the `ClockService`, though, this approach (unfortunately) will not work, because parts of Isis (still) delegate to the `Clock` singleton rather than using the `ClockService` domain service.
+In the case of the `ClockService`, though, this approach (unfortunately) will not work, because parts of Apache Isis (still) delegate to the `Clock` singleton rather than using the `ClockService` domain service.
The workaround, therefore, is to implement your functionality as a subclass of `Clock`. You can write a domain service that will ensure that your implementation is used ahead of any implementations provided by the framework.
@@ -99,6 +99,6 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `ClockService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `ClockService` is automatically registered (it is annotated with `@DomainService`) so no further configuration is required.
If you want to use a different implementation of `Clock`, eg delegating to NNTP, then do _not_ register directly, but instead subclass from `o.a.i.applib.clock.Clock` singleton (as described in the section above).
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-CommandContext.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-CommandContext.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-CommandContext.adoc
index bbde20f..a97d19b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-CommandContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-CommandContext.adoc
@@ -203,7 +203,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `CommandContext` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `CommandContext` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DeepLinkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DeepLinkService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DeepLinkService.adoc
index 8d7fba3..cda03e9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DeepLinkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DeepLinkService.adoc
@@ -23,7 +23,7 @@ public interface DeepLinkService {
URI deepLinkFor(Object domainObject); // <1>
}
----
-<1> Creates a URI that can be used to obtain a representation of the provided domain object in one of the Isis viewers.
+<1> Creates a URI that can be used to obtain a representation of the provided domain object in one of the Apache Isis viewers.
The xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] this provides an implementation for accessing the representation through this viewer. (For the xref:ug.adoc#_ug_restfulobjects-viewer[RestfulObjects viewer], a URL can be constructed according to the link:http://www.restfulobjects.org[Restful Objects spec] in conjunction with a `Bookmark` obtained via the xref:rg.adoc#_rg_services-api_manpage-BookmarkService[`BookmarkService`]).
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer.adoc
index b359f8a..77fda3e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer.adoc
@@ -9,7 +9,7 @@ The `DomainObjectContainer` service provides a set of general purpose functional
[NOTE]
====
-Compared to other services provided by Isis, the `DomainObjectContainer` provides by far the most number of methods, addressing several quite distinct responsibilities. This is a historical accident: in early versions of Isis the `DomainObjectContainer` was the one and only domain service provided by the framework.
+Compared to other services provided by Apache Isis, the `DomainObjectContainer` provides by far the most number of methods, addressing several quite distinct responsibilities. This is a historical accident: in early versions of Apache Isis the `DomainObjectContainer` was the one and only domain service provided by the framework.
In the future we may deprecate this service and break out its responsibilities into a number of small services. However, given how important this service was in days past, we are unlikely to delete it as a service even once it has been deprecated.
====
@@ -40,4 +40,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `DomainObjectContainer` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `DomainObjectContainer` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-creation-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-creation-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-creation-api.adoc
index 8269b1d..1c803fd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-creation-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-creation-api.adoc
@@ -19,7 +19,7 @@ public interface DomainObjectContainer {
}
----
<1> create a new non-persisted domain entity. Any services will be automatically injected into the service
-<2> create a new view model, with the specified memento (as per xref:rg.adoc#_rg_classes_super_manpage-AbstractViewModel[ViewModel#viewModelMemento()]. In general it is easier to just annotate with xref:rg.adoc#_rg_annotations_manpage-ViewModel[`@ViewModel`] and let Isis manage the memento automatically.
+<2> create a new view model, with the specified memento (as per xref:rg.adoc#_rg_classes_super_manpage-AbstractViewModel[ViewModel#viewModelMemento()]. In general it is easier to just annotate with xref:rg.adoc#_rg_annotations_manpage-ViewModel[`@ViewModel`] and let Apache Isis manage the memento automatically.
For example:
@@ -35,6 +35,6 @@ As an alternative to using `newTransientInstance(...)`, you could also simply `n
[NOTE]
====
-Calling `new(...)` also this circumvents Isis' xref:rg.adoc#_rg_methods_reserved_manpage-created[`created()`] callback, and in addition any default values for properties (either explicitly set by xref:rg.adoc#_rg_methods_prefixes_manpage-default[`default...()`] or defaulted implicitly according to Isis' own conventions) will not be called either. If you don't intend to use these features, though, the net effect is code that has less coupling to Isis and is arguably easier to understand (has "less magic" happening).
+Calling `new(...)` also this circumvents Apache Isis' xref:rg.adoc#_rg_methods_reserved_manpage-created[`created()`] callback, and in addition any default values for properties (either explicitly set by xref:rg.adoc#_rg_methods_prefixes_manpage-default[`default...()`] or defaulted implicitly according to Apache Isis' own conventions) will not be called either. If you don't intend to use these features, though, the net effect is code that has less coupling to Isis and is arguably easier to understand (has "less magic" happening).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-persistence-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-persistence-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-persistence-api.adoc
index 4b3a28d..fb89e51 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-persistence-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_object-persistence-api.adoc
@@ -54,7 +54,7 @@ cust.setLastName("Mercury");
container.persistIfNotAlready(cust);
----
-You should be aware that by default Isis queues up calls to `#persist()` and `#remove()`. These are then executed either when the request completes (and the transaction commits), or if the queue is flushed. This can be done either implicitly by the framework, or as the result of a direct call to `#flush()`.
+You should be aware that by default Apache Isis queues up calls to `#persist()` and `#remove()`. These are then executed either when the request completes (and the transaction commits), or if the queue is flushed. This can be done either implicitly by the framework, or as the result of a direct call to `#flush()`.
By default the framework itself will cause `#flush()` to be called whenever a query is executed by way of `#allMatches(Query)`, as documented xref:rg.adoc#_rg_services-api_manpage-DomainObjectContainer_generic-repository-api[above]. However, this behaviour can be disabled using the xref:ug.adoc#_ug_runtime_configuring-core[configuration property] `isis.services.container.disableAutoFlush`.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_presentation-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_presentation-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_presentation-api.adoc
index d153934..32bec20 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_presentation-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_presentation-api.adoc
@@ -9,7 +9,7 @@
A responsibility of every domain object is to return a title. This can be done declaratively using the xref:rg.adoc#_rg_annotations_manpage-Title[`@Title`] annotation on property/ies, or it can be done imperatively by writing a xref:rg.adoc#_rg_methods_reserved_manpage-title[`title()`] method.
-It's quite common for titles to be built up of the titles of other objects. If using building up the title using `@Title` then Isis will automatically use the title of the objects referenced by the annotated properties. We also need programmatic access to these titles if going the imperative route.
+It's quite common for titles to be built up of the titles of other objects. If using building up the title using `@Title` then Apache Isis will automatically use the title of the objects referenced by the annotated properties. We also need programmatic access to these titles if going the imperative route.
Similarly, it often makes sense if xref:rg.adoc#_rg_services-api_manpage-DomainObjectContainer_messages-api[raising messages] to use the title of an object in a message rather (than a some other property of the object), because this is how end-users will be used to identifying the object.
@@ -23,7 +23,7 @@ public interface DomainObjectContainer {
...
}
----
-<1> return the title of the object, as rendered in the UI by the Isis viewers.
+<1> return the title of the object, as rendered in the UI by the Apache Isis viewers.
By way of example, here's some code from the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] showing the use of the API in an message:
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_validation-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_validation-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_validation-api.adoc
index 5cfec93..1a6cc11 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_validation-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-DomainObjectContainer_validation-api.adoc
@@ -21,6 +21,6 @@ public interface DomainObjectContainer {
}
----
-If an object is changed by editing its properties, then (using the xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] at least) Isis will check that the state of the object is valid. There is currently however no equivalent guarantee for actions.
+If an object is changed by editing its properties, then (using the xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] at least) Apache Isis will check that the state of the object is valid. There is currently however no equivalent guarantee for actions.
The intent of this API was (originally at least) to provide a fallback whereby actions could at least be able to perform this validation programmatically (eg in their own xref:rg.adoc#_rg_methods_prefixes_manpage-validate[`validate...()`] or xref:rg.adoc#_rg_methods_prefixes_manpage-disable[`disable...()`] methods. However, this feature should be considered experimental; your mileage may vary.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EmailService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EmailService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EmailService.adoc
index 367958d..fd16f10 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EmailService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EmailService.adoc
@@ -69,10 +69,10 @@ where "xxx" is the gmail user account and "yyy" is its password
If you wish to write an alternative implementation, be aware that it should process the message body as HTML (as opposed to plain text or any other format).
-Also, note that (unlike most Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailService` is used as part of the xref:ug.adoc#_ug_wicket-viewer_features_user-registration[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Isis runtime. This implies a couple of additional constraints:
+Also, note that (unlike most Apache Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailService` is used as part of the xref:ug.adoc#_ug_wicket-viewer_features_user-registration[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime. This implies a couple of additional constraints:
* first, implementation class should also be annotated with `@com.google.inject.Singleton`
-* second, there may not be any Isis session running. (If necessary, one can be created on the fly using `IsisContext.doInSession(...)`)
+* second, there may not be any Apache Isis session running. (If necessary, one can be created on the fly using `IsisContext.doInSession(...)`)
To ensure that your alternative implementation takes the place of the default implementation, register it explicitly in `isis.properties`.
@@ -87,7 +87,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `EmailService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `EmailService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
If you have written an alternative implementation, then register your implementation in `isis.properties` under the "isis.services" key and it will be used instead.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EventBusService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EventBusService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EventBusService.adoc
index eccd7c7..181580e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EventBusService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-EventBusService.adoc
@@ -164,7 +164,7 @@ By creating domain event subtypes we can be more semantically precise and in tur
We recommend that you define event classes at (up to) four scopes:
-* at the top "global" scope is the Isis-defined `o.a.i.applib.event.ActionDomainEvent`
+* at the top "global" scope is the Apache Isis-defined `o.a.i.applib.event.ActionDomainEvent`
* for the "module" scope, create a static class to represent the module itself, and creating nested classes within
* for each "class" scope, create a nested static event class in the domain object's class for all of the domain object's actions
* for each "action" scope, create a nested static event class for that action, inheriting from the "domain object" class.
@@ -290,7 +290,7 @@ public class ReserveStockSubscriber {
== Implementation SPI
-The implementation of `EventBusService` provided by Isis will by default use link:https://code.google.com/p/guava-libraries/[Guava]'s https://code.google.com/p/guava-libraries/wiki/EventBusExplained[`EventBus`] as the underlying in-memory event bus. Alternatively the link:http://www.axonframework.org/[AxonFramework]'s link:http://www.axonframework.org/docs/2.4/single.html#d5e1489[SimpleEventBus] can be used. Which is used is specified through configuration property (described xref:rg.adoc#_rg_services-api_manpage-EventBusService_Configuration[below]).
+The implementation of `EventBusService` provided by Apache Isis will by default use link:https://code.google.com/p/guava-libraries/[Guava]'s https://code.google.com/p/guava-libraries/wiki/EventBusExplained[`EventBus`] as the underlying in-memory event bus. Alternatively the link:http://www.axonframework.org/[AxonFramework]'s link:http://www.axonframework.org/docs/2.4/single.html#d5e1489[SimpleEventBus] can be used. Which is used is specified through configuration property (described xref:rg.adoc#_rg_services-api_manpage-EventBusService_Configuration[below]).
[NOTE]
.Guava vs Axon, which to use?
@@ -321,7 +321,7 @@ If you do provide your own implementation of this SPI, be aware that your subscr
[[_rg_services-api_manpage-EventBusService_Configuration]]
== Configuration
-The implementation of `EventBusService` provided by Isis will by default use link:https://code.google.com/p/guava-libraries/[Guava]'s https://code.google.com/p/guava-libraries/wiki/EventBusExplained[`EventBus`] as the underlying in-memory event bus. Alternatively the link:http://www.axonframework.org/[AxonFramework]'s link:http://www.axonframework.org/docs/2.4/single.html#d5e1489[SimpleEventBus] can be used.
+The implementation of `EventBusService` provided by Apache Isis will by default use link:https://code.google.com/p/guava-libraries/[Guava]'s https://code.google.com/p/guava-libraries/wiki/EventBusExplained[`EventBus`] as the underlying in-memory event bus. Alternatively the link:http://www.axonframework.org/[AxonFramework]'s link:http://www.axonframework.org/docs/2.4/single.html#d5e1489[SimpleEventBus] can be used.
To specify which, add the xref:ug.adoc#_ug_runtime_configuring-core[configuration property] `isis.services.eventbus.implementation`:
@@ -368,7 +368,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `EventBusService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `EventBusService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
@@ -376,6 +376,6 @@ then Isis' core implementation of `EventBusService` service is automatically reg
== Related Services
-The `EventBusService` is intended for fine-grained publish/subscribe for object-to-object interactions within an Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).
+The `EventBusService` is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).
-The xref:rg.adoc#_rg_services-spi_manpage-PublishingService[`PublishingService`] meanwhile is intended for coarse-grained publish/subscribe for system-to-system interactions, from Isis to some other system. Here the only events published are those that action invocations (for actions annotated with xref:rg.adoc#_rg_annotations_manpage-Action_publishing[`@Action#publishing()`]) and of changed objects (for objects annotated with xref:rg.adoc#_rg_annotations_manpage-DomainObject_publishing[`@DomainObject#publishing()`]).
\ No newline at end of file
+The xref:rg.adoc#_rg_services-spi_manpage-PublishingService[`PublishingService`] meanwhile is intended for coarse-grained publish/subscribe for system-to-system interactions, from Apache Isis to some other system. Here the only events published are those that action invocations (for actions annotated with xref:rg.adoc#_rg_annotations_manpage-Action_publishing[`@Action#publishing()`]) and of changed objects (for objects annotated with xref:rg.adoc#_rg_annotations_manpage-DomainObject_publishing[`@DomainObject#publishing()`]).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-GuiceBeanProvider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-GuiceBeanProvider.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-GuiceBeanProvider.adoc
index dfa5fb6..4dd4d32 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-GuiceBeanProvider.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-GuiceBeanProvider.adoc
@@ -5,13 +5,13 @@
:_imagesdir: images/
-The `GuiceBeanProvider` domain service acts as a bridge between Isis' xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] internal bootstrapping using link:https://github.com/google/guice[Google Guice].
+The `GuiceBeanProvider` domain service acts as a bridge between Apache Isis' xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] internal bootstrapping using link:https://github.com/google/guice[Google Guice].
This service operates at a very low-level, and you are unlikely to have a need for it. It is used internally by the framework, in the default implementation of the xref:rg.adoc#_rg_services-api_manpage-DeepLinkService[`DeepLinkService`].
[NOTE]
====
-Currently Isis uses a combination of Guice (within the Wicket viewer only) and a home-grown dependency injection framework. In future versions we intended to refactor the framework to use CDI throughout. At that time this service is likely to become redundant because we will allow any of the internal components of Isis to be injected into your domain object code.
+Currently Apache Isis uses a combination of Guice (within the Wicket viewer only) and a home-grown dependency injection framework. In future versions we intended to refactor the framework to use CDI throughout. At that time this service is likely to become redundant because we will allow any of the internal components of Apache Isis to be injected into your domain object code.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-IsisJdoSupport.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-IsisJdoSupport.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-IsisJdoSupport.adoc
index 8cd4969..b4354bd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-IsisJdoSupport.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-IsisJdoSupport.adoc
@@ -163,9 +163,9 @@ public class TearDownAll extends FixtureScriptAbstract {
[NOTE]
====
-It can occasionally be the case that Isis' internal adapter for the domain object is
+It can occasionally be the case that Apache Isis' internal adapter for the domain object is
still in memory. JDO/DataNucleus seems to bump up the version of the object prior to its deletion,
-which under normal circumstances would cause Isis to throw a concurrency exception. Therefore
+which under normal circumstances would cause Apache Isis to throw a concurrency exception. Therefore
to prevent this from happening (ie to _force_ the deletion of all instances), concurrency checking
is temporarily disabled while this method is performed.
====
@@ -273,4 +273,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `IsisJdoSupport` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `IsisJdoSupport` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MementoService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MementoService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MementoService.adoc
index 8bc6025..f0b069c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MementoService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MementoService.adoc
@@ -47,7 +47,7 @@ In fact, the `MementoServiceDefault` implementation does provide a mechanism to
However, you are of course free to write some other implementation of `MementoService`, perhaps based on `MementoServiceDefault` code if you wish.
====
-The types of objects that are supported by the `MementoService` are implementation-specific, but would typically include all the usual value types as well as Isis' `Bookmark` class (to represent references to arbitrary entities). Nulls can also be set.
+The types of objects that are supported by the `MementoService` are implementation-specific, but would typically include all the usual value types as well as Apache Isis' `Bookmark` class (to represent references to arbitrary entities). Nulls can also be set.
In the case of the default implementation provided by the core framework, the types supported are:
@@ -128,4 +128,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `MementoService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `MementoService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MetamodelService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MetamodelService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MetamodelService.adoc
index 0feac25..4fca407 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MetamodelService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-MetamodelService.adoc
@@ -6,7 +6,7 @@
-The `MetaModelService` provides access (albeit currently extremely limited) to aspects of Isis' internal metamodel.
+The `MetaModelService` provides access (albeit currently extremely limited) to aspects of Apache Isis' internal metamodel.
Currently this is limited to looking up the object type (as specified in xref:rg.adoc#_rg_annotations_manpage-DomainObject_objectType[`@DomainObject#objectType()`] and equivalent mechanisms, and as used in xref:rg.adoc#_rg_services-api_manpage-BookmarkService[`Bookmark`]s and elsewhere) from an object's class, and vice versa. In the future we expect other aspects of the metamodel to also be formally surfaced through this API.
@@ -39,4 +39,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `MetamodelService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `MetamodelService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-QueryResultsCache.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-QueryResultsCache.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-QueryResultsCache.adoc
index b8d2274..27d6f13 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-QueryResultsCache.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-QueryResultsCache.adoc
@@ -117,7 +117,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `QueryResultsCache` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `QueryResultsCache` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ScratchPad.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ScratchPad.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ScratchPad.adoc
index 22331cc..b4ce0b4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ScratchPad.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-ScratchPad.adoc
@@ -113,7 +113,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `Scratchpad` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `Scratchpad` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-SudoService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-SudoService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-SudoService.adoc
index 3bc0710..19cb15d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-SudoService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-SudoService.adoc
@@ -65,4 +65,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `SudoService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `SudoService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-WrapperFactory.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-WrapperFactory.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-WrapperFactory.adoc
index 47bfeba..0abc668 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-WrapperFactory.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-WrapperFactory.adoc
@@ -63,7 +63,7 @@ public interface WrapperFactory {
-The service works by returning a "wrapper" around a supplied domain object (a link:http://www.javassist.org[javassist] proxy), and it is this wrapper that ensures that the hide/disable/validate rules implies by the Isis programming model are enforced. The wrapper can be interacted with as follows:
+The service works by returning a "wrapper" around a supplied domain object (a link:http://www.javassist.org[javassist] proxy), and it is this wrapper that ensures that the hide/disable/validate rules implies by the Apache Isis programming model are enforced. The wrapper can be interacted with as follows:
* a `get...()` method for properties or collections
* a `set...()` method for properties
@@ -116,7 +116,7 @@ public class CustomerAgent {
====
It ought to be possible to implement an xref:rg.adoc#_rg_services-spi_manpage-ExceptionRecognizer[`ExceptionRecognizer`]s that would allow the above boilerplate to be removed. This recognizer service would recognize the `InteractionException` and convert to a suitable message.
-At the time of writing Isis does not provide an out-of-the-box implementation of such an `ExceptionRecognizer`; but it should be simple enough to write one…
+At the time of writing Apache Isis does not provide an out-of-the-box implementation of such an `ExceptionRecognizer`; but it should be simple enough to write one…
====
@@ -145,7 +145,7 @@ public interface WrapperFactory {
<3> remove an `InteractionListener`, to no longer be notified of interactions on wrappers.
<4> used by the framework itself
-The original intent of this API was to enable test transcripts to be captured (in a BDD-like fashion) from integration tests. No such feature has yet been implemented however. Also, the capabilities have by and large been superceded by Isis' support for domain events. We may therefore deprecate this API in the future.
+The original intent of this API was to enable test transcripts to be captured (in a BDD-like fashion) from integration tests. No such feature has yet been implemented however. Also, the capabilities have by and large been superceded by Apache Isis' support for domain events. We may therefore deprecate this API in the future.
@@ -159,4 +159,4 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `WrapperFactory` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `WrapperFactory` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-XmlSnapshotService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-XmlSnapshotService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-XmlSnapshotService.adoc
index d4d0d2f..845ea9a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-XmlSnapshotService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-api_manpage-XmlSnapshotService.adoc
@@ -200,7 +200,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `XmlSnapshotService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `XmlSnapshotService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
== Related Services
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi.adoc
index b4a3f45..34674c5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi.adoc
@@ -7,7 +7,7 @@
Apache Isis includes an extensive number of domain services for your domain objects to use; these are listed in xref:rg.adoc#_rg_services-api[Reference: Domain Services (API)] chapter.
-There are other domain services that constitute not an API but an SPI; if present they are used by Isis itself rather than by your domain objects. A good example of this is the xref:rg.adoc#_rg_services-spi_manpage-AuditingService[`AuditingService`] service; if an implementation is present then Isis will call that service in order to record audit log entries. If no implementation is available then Isis will carry on regardless.
+There are other domain services that constitute not an API but an SPI; if present they are used by Apache Isis itself rather than by your domain objects. A good example of this is the xref:rg.adoc#_rg_services-spi_manpage-AuditingService[`AuditingService`] service; if an implementation is present then Apache Isis will call that service in order to record audit log entries. If no implementation is available then Apache Isis will carry on regardless.
Some domain services can be considered both API and SPI; a good example is the xref:rg.adoc#_rg_services-api_manpage-EmailService[`EmailService`] that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the xref:ug.adoc#_ug_wicket-viewer_features_user-registration[user registration] functionality supported by the xref:ug.adoc#_ug_wicket-viewer[Wicket viewer]. The same is true of the xref:rg.adoc#_rg_services-api_manpage-EventBusService[`EventBusService`]; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for xref:rg.adoc#_rg_annotations_manpage-Action_domainEvent[`@Action#domainEvent()`] etc.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ClassDiscoveryService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ClassDiscoveryService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ClassDiscoveryService.adoc
index db75edd..2c5acf7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ClassDiscoveryService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ClassDiscoveryService.adoc
@@ -75,7 +75,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `ClassDiscoveryService2` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+then Apache Isis' core implementation of `ClassDiscoveryService2` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentMappingService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentMappingService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentMappingService.adoc
index f55aa82..86d3229 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentMappingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentMappingService.adoc
@@ -41,7 +41,7 @@ This is an "internal" SPI, meaning that it uses types that are not part of the I
== Implementations
-No default implementations are provided by Isis framework itself. However, the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] includes a sample implementation to convert its `ToDoItem` entity into a `ToDoItemDto` (JAXB annotated and derived from an XSD). This uses the link:http://orika-mapper.github.io/orika-docs/intro.html[Orika] mapping library.
+No default implementations are provided by Apache Isis framework itself. However, the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] includes a sample implementation to convert its `ToDoItem` entity into a `ToDoItemDto` (JAXB annotated and derived from an XSD). This uses the link:http://orika-mapper.github.io/orika-docs/intro.html[Orika] mapping library.
The source code is:
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentNegotiationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentNegotiationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentNegotiationService.adoc
index 4320fbc..b152af2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentNegotiationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ContentNegotiationService.adoc
@@ -14,7 +14,7 @@ Another use case is to support "third party" REST clients over which you have no
Instead you need to create some sort of stable facade over your domain entities, one which you will preserve even if the domain entities change. There are three ways in which you can do this:
-* first is to solve the problem at the domain layer by defining a regular Isis xref:ug.adoc#_ug_more-advanced_view-models[view model]. This is then surfaced over the RO viewer. +
+* first is to solve the problem at the domain layer by defining a regular Apache Isis xref:ug.adoc#_ug_more-advanced_view-models[view model]. This is then surfaced over the RO viewer. +
+
If the underlying entities change, then care must be taken to ensure that structure of the view model nevertheless is unchanged.
@@ -26,7 +26,7 @@ If the underlying tables change (as the result of a change in their correspondin
+
The `ContentNegotiationService` is responsible for inspecting the HTTP `Accept` header, and use this to select the correct representation to render. +
+
-The Isis framework provides a default implementation of `ContentNegotiationService` which inspects the "x-ro-domaintype" component of the HTTP `Accept` header. If present, this implementation will delegate to the companion xref:rg.adoc#_rg_services-spi_manpage-ContentMappingService[`ContentMappingService`] service, if configured. +
+The Apache Isis framework provides a default implementation of `ContentNegotiationService` which inspects the "x-ro-domaintype" component of the HTTP `Accept` header. If present, this implementation will delegate to the companion xref:rg.adoc#_rg_services-spi_manpage-ContentMappingService[`ContentMappingService`] service, if configured. +
+
A typical implementation of `ContentMappingService` will convert the domain object into some sort of DTO (data transfer object) as specified by the "x-ro-domaintype". If this DTO is annotated with JAXB or Jackson mappings, then the RO viewer (courtesy of the underlying link:http://resteasy.jboss.org/[RestEasy] framework) can serialize these directly +
+
@@ -178,7 +178,7 @@ The default `ContentNegotiationServiceXRoDomainType` implementation provides a x
isis.services.ContentNegotiationServiceXRoDomainType.prettyPrint=true
----
-If the property is not set, then the default depends on the xref:_ug_runtime_deployment-types[deployment type]; production mode will disable pretty printing, while prototyping mode will enable it.
+If the property is not set, then the default depends on the xref:ug.adoc#_ug_runtime_deployment-types[deployment type]; production mode will disable pretty printing, while prototyping mode will enable it.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-EmailNotificationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-EmailNotificationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-EmailNotificationService.adoc
index 97ce2a2..6072bbc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-EmailNotificationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-EmailNotificationService.adoc
@@ -49,12 +49,12 @@ The text of these email templates is hard-coded as resources, in other words bak
If you have configured an alternative email service implementation, it should process the message body as HTML.
-If you wish to write an alternative implementation of this service, note that (unlike most Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailNotificationService` is used as part of the xref:ug.adoc#_ug_wicket-viewer_features_user-registration[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Isis runtime.
+If you wish to write an alternative implementation of this service, note that (unlike most Apache Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailNotificationService` is used as part of the xref:ug.adoc#_ug_wicket-viewer_features_user-registration[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime.
This implies a couple of additional constraints:
* first, implementation class should also be annotated with `@com.google.inject.Singleton`
-* second, there may not be any Isis session running. (If necessary, one can be created on the fly using `IsisContext.doInSession(...)`)
+* second, there may not be any Apache Isis session running. (If necessary, one can be created on the fly using `IsisContext.doInSession(...)`)
To ensure that your alternative implementation takes the place of the default implementation, register it explicitly in `isis.properties`.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ExceptionRecognizer.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ExceptionRecognizer.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ExceptionRecognizer.adoc
index 668bf7e..04fbd03 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ExceptionRecognizer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-ExceptionRecognizer.adoc
@@ -69,10 +69,10 @@ public interface ExceptionRecognizer2 ... {
<6> recognized, but uncategorized (typically: a recognizer of the original `ExceptionRecognizer` API).
-In essence, if an exception is recognized then it is also categorized. This lets the viewer act accordingly. For example, if an exception is raised from the loading of an individual object, then this is passed by the registered ``ExceptionRecognizer``s. If any of these recognize the exception as representing a not-found exception, then an Isis `ObjectNotFoundException` is raised. Both the viewers interprets this correctly (the xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] as a suitable error page, the xref:ug.adoc#_ug_restfulobjects-viewer[Restful Objects viewer] as a 404 status return code).
+In essence, if an exception is recognized then it is also categorized. This lets the viewer act accordingly. For example, if an exception is raised from the loading of an individual object, then this is passed by the registered ``ExceptionRecognizer``s. If any of these recognize the exception as representing a not-found exception, then an Apache Isis `ObjectNotFoundException` is raised. Both the viewers interprets this correctly (the xref:ug.adoc#_ug_wicket-viewer[Wicket viewer] as a suitable error page, the xref:ug.adoc#_ug_restfulobjects-viewer[Restful Objects viewer] as a 404 status return code).
-If the implementation recognizes the exception then it returns a user-friendly message to be rendered (by the viewer) back to the user; otherwise it returns `null`. There is no need for the implementation to check for exception causes; the casual chain is unwrapped by Isis core and each exception in the chain will also be passed through to the recognizer (from most specific to least). The recognizer implementation can therefore be as fine-grained or as coarse-grained as it wishes.
+If the implementation recognizes the exception then it returns a user-friendly message to be rendered (by the viewer) back to the user; otherwise it returns `null`. There is no need for the implementation to check for exception causes; the casual chain is unwrapped by Apache Isis core and each exception in the chain will also be passed through to the recognizer (from most specific to least). The recognizer implementation can therefore be as fine-grained or as coarse-grained as it wishes.
@@ -81,7 +81,7 @@ If the implementation recognizes the exception then it returns a user-friendly m
The framework provides two default implementations:
-* `o.a.i.core.metamodel.services.container.DomainObjectContainerDefault` provided by Isis core is itself an `ExceptionRecognizer`, and will handle ``ConcurrencyException``s. It will also handle any application exceptions raised by the system (subclasses of `o.a.i.applib.RecoverableException`).
+* `o.a.i.core.metamodel.services.container.DomainObjectContainerDefault` provided by Apache Isis core is itself an `ExceptionRecognizer`, and will handle ``ConcurrencyException``s. It will also handle any application exceptions raised by the system (subclasses of `o.a.i.applib.RecoverableException`).
* `o.a.i.objectstore.jdo.applib.service.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore` bundles up a number of more fine-grained implementations:
** `ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException`
@@ -121,5 +121,5 @@ Prior to 1.9.0, the `ExceptionRecognizerCompositeForJdoObjectStore` also require
====
-If the JDO exception recognizers are not required (rather unlikely), then they can be disabled en-masse using the xref:_ug_runtime_configuring-core[configuration property] `isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable`.
+If the JDO exception recognizers are not required (rather unlikely), then they can be disabled en-masse using the xref:ug.adoc#_ug_runtime_configuring-core[configuration property] `isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable`.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-LocaleProvider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-LocaleProvider.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-LocaleProvider.adoc
index eb4085e..689fbb4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-LocaleProvider.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-LocaleProvider.adoc
@@ -6,14 +6,14 @@
-The `LocaleProvider` service is one of the services that work together to implement Isis' support for i18n, being used by Isis' default implementation of xref:rg.adoc#_rg_services-spi_manpage-TranslationService[`TranslationService`].
+The `LocaleProvider` service is one of the services that work together to implement Apache Isis' support for i18n, being used by Isis' default implementation of xref:rg.adoc#_rg_services-spi_manpage-TranslationService[`TranslationService`].
The role of the service itself is simply to return the `Locale` of the current user.
[NOTE]
====
-For the "big picture" and further details on Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
+For the "big picture" and further details on Apache Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
====
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-PublishingService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-PublishingService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-PublishingService.adoc
index cb35e8f..f949955 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-PublishingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-PublishingService.adoc
@@ -6,7 +6,7 @@
-The `PublishingService` is intended for coarse-grained publish/subscribe for system-to-system interactions, from Isis to some other system. Here the only events published are those that action invocations and of changed objects. A typical use case is to publish onto a pub/sub bus such as link:http://activemq.apache.org/[ActiveMQ] with link:http://camel.apache.org[Camel] to keep other systems up to date.
+The `PublishingService` is intended for coarse-grained publish/subscribe for system-to-system interactions, from Apache Isis to some other system. Here the only events published are those that action invocations and of changed objects. A typical use case is to publish onto a pub/sub bus such as link:http://activemq.apache.org/[ActiveMQ] with link:http://camel.apache.org[Camel] to keep other systems up to date.
@@ -59,7 +59,7 @@ To indicate that an action invocation should be published, annotate it with the
To indicate that a changed object should be published is to annotate it with the xref:rg.adoc#_rg_annotations_manpage-DomainObject_publishing[`@DomainObject#publishing()`] annotation.
-It is also possible to "fine-tune" the `EventPayload` using the `#publishingFactory()` attribute (for both annotations). By default the `EventPayload` that is serialized identifies the object(s) being interacted with or changed, and in the case of the action invocation provides details of the action arguments and result (if any) of that action. However, the payload does not (by default) include any information about the new state of these objects. It is therefore the responsibility of the subscriber to call back to Isis to determine any information that has not been published.
+It is also possible to "fine-tune" the `EventPayload` using the `#publishingFactory()` attribute (for both annotations). By default the `EventPayload` that is serialized identifies the object(s) being interacted with or changed, and in the case of the action invocation provides details of the action arguments and result (if any) of that action. However, the payload does not (by default) include any information about the new state of these objects. It is therefore the responsibility of the subscriber to call back to Apache Isis to determine any information that has not been published.
Although the representations (if using the Restful Object serializer and Restful Objects viewer) does include hrefs for the objects, this nevertheless requires an additional network call to obtain this information).
@@ -145,9 +145,9 @@ then adding the (non-ASF) http://github.com/isisaddons/isis-module-publishing[Is
== Related Services
-The `PublishingService` is intended for coarse-grained publish/subscribe for system-to-system interactions, from Isis to some other system. Here the only events published are those that action invocations (for actions annotated with xref:rg.adoc#_rg_annotations_manpage-Action_publishing[`@Action#publishing()`]) and of changed objects (for objects annotated with xref:rg.adoc#_rg_annotations_manpage-DomainObject_publishing[`@DomainObject#publishing()`].
+The `PublishingService` is intended for coarse-grained publish/subscribe for system-to-system interactions, from Apache Isis to some other system. Here the only events published are those that action invocations (for actions annotated with xref:rg.adoc#_rg_annotations_manpage-Action_publishing[`@Action#publishing()`]) and of changed objects (for objects annotated with xref:rg.adoc#_rg_annotations_manpage-DomainObject_publishing[`@DomainObject#publishing()`].
-The xref:rg.adoc#_rg_services-api_manpage-EventBusService[`EventBusService`] meanwhile is intended for fine-grained publish/subscribe for object-to-object interactions within an Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).
+The xref:rg.adoc#_rg_services-api_manpage-EventBusService[`EventBusService`] meanwhile is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).
All three of these services collaborate implicitly by way of the xref:rg.adoc#_rg_classes_mixins_manpage-HasTransactionId[`HasTransactionId`] interface.
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationService.adoc
index 21fa92e..8762000 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationService.adoc
@@ -6,12 +6,12 @@
-The `TranslationService` is the cornerstone of Isis' i18n support. Its role is to be able to provide translated versions of the various elements within the Isis metamodel (service and object classes, properties, collections, actions, action parameters) and also to translate business rule (disable/valid) messages, and exceptions. These translations provide for both singular and plural forms.
+The `TranslationService` is the cornerstone of Apache Isis' i18n support. Its role is to be able to provide translated versions of the various elements within the Apache Isis metamodel (service and object classes, properties, collections, actions, action parameters) and also to translate business rule (disable/valid) messages, and exceptions. These translations provide for both singular and plural forms.
[NOTE]
====
-For the "big picture" and further details on Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
+For the "big picture" and further details on Apache Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
====
@@ -49,7 +49,7 @@ If in write mode, then the implementation is saving translation keys, and will a
== Implementation
-The Isis framework provides a default implementation (`TranslationServicePo`) that uses the GNU `.pot` and `.po` files for translations. It relies on the `LocaleProvider` service (to return the `Locale` of the current user) and also the `TranslationsResolver` service (to read existing translations).
+The Apache Isis framework provides a default implementation (`TranslationServicePo`) that uses the GNU `.pot` and `.po` files for translations. It relies on the `LocaleProvider` service (to return the `Locale` of the current user) and also the `TranslationsResolver` service (to read existing translations).
The framework also provides a supporting `TranslationServicePoMenu` provides menu items under the "Prototyping" secondary menu for controlling this service and downloading `.pot` files for translation.
@@ -67,7 +67,7 @@ Assuming that the `configuration-and-annotation` services installer is configure
isis.services-installer=configuration-and-annotation
----
-then Isis' core implementation of `TranslationService` service (along with the supporting menu service) are automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required. If the menu items are not required then these can be suppressed either using security or by implementing a xref:ug.adoc#_ug_more-advanced_decoupling_vetoing-visibility[vetoing subscriber].
+then Apache Isis' core implementation of `TranslationService` service (along with the supporting menu service) are automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required. If the menu items are not required then these can be suppressed either using security or by implementing a xref:ug.adoc#_ug_more-advanced_decoupling_vetoing-visibility[vetoing subscriber].
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationsResolver.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationsResolver.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationsResolver.adoc
index 039de22..d773893 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationsResolver.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-TranslationsResolver.adoc
@@ -6,14 +6,14 @@
-The `TranslationsResolver` service is one of the services that work together to implement Isis' support for i18n, being used by Isis' default implementation of xref:rg.adoc#_rg_services-spi_manpage-TranslationService[`TranslationService`].
+The `TranslationsResolver` service is one of the services that work together to implement Apache Isis' support for i18n, being used by Isis' default implementation of xref:rg.adoc#_rg_services-spi_manpage-TranslationService[`TranslationService`].
The role of the service itself is locate and return translations.
[NOTE]
====
-For the "big picture" and further details on Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
+For the "big picture" and further details on Apache Isis' i18n support, see xref:ug.adoc#_ug_more-advanced_i18n[here].
====
http://git-wip-us.apache.org/repos/asf/isis/blob/fe19dc4b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-UserProfileService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-UserProfileService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-UserProfileService.adoc
index 3850741..00048c5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-UserProfileService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_services-spi_manpage-UserProfileService.adoc
@@ -40,5 +40,5 @@ image::{_imagesdir}reference-services-spi/UserProfileService/todoapp.png[width="
[NOTE]
====
-Currently this feature is not integrated with Isis' authentication mechanisms; the information provided is purely metadata provided for presentation purposes only.
+Currently this feature is not integrated with Apache Isis' authentication mechanisms; the information provided is purely metadata provided for presentation purposes only.
====