You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/03/03 13:45:42 UTC
[isis] 02/02: ISIS-2296: merge with origin
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5faa3d3eb1d47cf88c812dee60895926785e7799
Merge: 928ead0 33cd680
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 3 14:45:23 2020 +0100
ISIS-2296: merge with origin
.../applib-ant/examples/annotation/Action.java | 61 ++++---
.../examples/annotation/ActionLayout.java | 51 +++---
.../applib-ant/examples/annotation/Auditing.java | 15 ++
.../examples/annotation/BookmarkPolicy.java | 17 +-
.../applib-ant/examples/annotation/Bounding.java | 2 +
.../applib-ant/examples/annotation/Collection.java | 39 +++--
.../examples/annotation/CollectionLayout.java | 44 ++---
.../examples/annotation/CommandExecuteIn.java | 22 +--
.../examples/annotation/CommandPersistence.java | 16 +-
.../examples/annotation/CommandReification.java | 15 ++
.../applib-ant/examples/annotation/Constants.java | 27 ---
.../examples/annotation/Contributed.java | 20 ++-
.../applib-ant/examples/annotation/Defaulted.java | 6 +
.../examples/annotation/DomainObject.java | 82 +++++----
.../examples/annotation/DomainObjectLayout.java | 56 ++++---
.../examples/annotation/DomainService.java | 23 ++-
.../examples/annotation/DomainServiceLayout.java | 17 +-
.../applib-ant/examples/annotation/Editing.java | 14 ++
.../examples/annotation/EqualByContent.java | 7 +-
.../applib-ant/examples/annotation/Facets.java | 7 +
.../applib-ant/examples/annotation/HomePage.java | 2 +
.../examples/annotation/LabelPosition.java | 9 +-
.../examples/annotation/MemberOrder.java | 6 +
.../examples/annotation/MementoSerialization.java | 12 ++
.../applib-ant/examples/annotation/MinLength.java | 3 +-
.../applib-ant/examples/annotation/Mixin.java | 6 +
.../applib-ant/examples/annotation/Module.java | 5 +-
.../applib-ant/examples/annotation/Nature.java | 29 +++-
.../examples/annotation/NatureOfService.java | 31 ++--
.../applib-ant/examples/annotation/Navigable.java | 9 +-
.../examples/annotation/Optionality.java | 27 ++-
.../examples/annotation/OrderPrecedence.java | 13 ++
.../applib-ant/examples/annotation/Parameter.java | 32 ++--
.../examples/annotation/ParameterLayout.java | 24 ++-
.../examples/annotation/Programmatic.java | 13 +-
.../applib-ant/examples/annotation/Projecting.java | 8 +
.../examples/annotation/PromptStyle.java | 27 ++-
.../applib-ant/examples/annotation/Property.java | 92 +++++-----
.../examples/annotation/PropertyLayout.java | 26 ++-
.../applib-ant/examples/annotation/Publishing.java | 15 ++
.../examples/annotation/PublishingChangeKind.java | 8 +-
.../applib-ant/examples/annotation/Redirect.java | 10 ++
.../applib-ant/examples/annotation/RenderDay.java | 12 +-
.../applib-ant/examples/annotation/Repainting.java | 10 ++
.../applib-ant/examples/annotation/RestrictTo.java | 6 +
.../examples/annotation/SemanticsOf.java | 35 +++-
.../applib-ant/examples/annotation/Title.java | 16 +-
.../applib-ant/examples/annotation/Value.java | 6 +
.../applib-ant/examples/annotation/ViewModel.java | 14 +-
.../examples/annotation/ViewModelLayout.java | 55 +++---
.../applib-ant/examples/annotation/Where.java | 65 ++++++++
.../examples/events}/EventObjectBase.java | 20 ++-
.../events/domain/AbstractDomainEvent.java | 185 +++++++++++++--------
.../examples/events/domain/ActionDomainEvent.java | 152 +++++++----------
.../events/domain/CollectionDomainEvent.java | 62 +++----
.../events/domain/PropertyDomainEvent.java | 55 +++---
.../events/lifecycle/AbstractLifecycleEvent.java | 6 +-
.../events/lifecycle/ObjectCreatedEvent.java | 23 +--
.../events/lifecycle/ObjectLoadedEvent.java | 25 +--
.../events/lifecycle/ObjectPersistedEvent.java | 24 +--
.../events/lifecycle/ObjectPersistingEvent.java | 22 +--
.../events/lifecycle/ObjectRemovingEvent.java | 22 +--
.../events/lifecycle/ObjectUpdatedEvent.java | 22 +--
.../events/lifecycle/ObjectUpdatingEvent.java | 22 +--
.../examples/events/ui/AbstractUiEvent.java | 11 +-
.../examples/events/ui/CssClassUiEvent.java | 56 ++++---
.../examples/events/ui/LayoutUiEvent.java | 64 ++++---
.../applib-cm/examples/events/ui/TitleUiEvent.java | 45 ++---
.../modules/applib-cm/examples/graph/Edge.java | 7 +-
.../applib-cm/examples/graph/SimpleEdge.java | 2 +
.../modules/applib-cm/examples/graph/Vertex.java | 15 +-
.../applib-cm/examples/security/RoleMemento.java | 27 ++-
.../applib-cm/examples/security/UserMemento.java | 73 ++++----
.../examples/spec/AbstractSpecification2.java | 2 +
.../applib-cm/examples/spec/Specification.java | 7 +-
.../applib-cm/examples/spec/Specification2.java | 7 +-
.../applib-cm/examples/spec/SpecificationAnd.java | 2 +
.../applib-cm/examples/spec/SpecificationNot.java | 2 +
.../applib-cm/examples/spec/SpecificationOr.java | 4 +-
.../modules/applib-cm/examples/util/Enums.java | 5 +-
.../modules/applib-cm/examples/util/JaxbUtil.java | 4 +-
.../modules/applib-cm/examples/value/Blob.java | 2 +
.../modules/applib-cm/examples/value/Clob.java | 2 +
.../modules/applib-cm/examples/value/Image.java | 2 +
.../examples/value/LocalResourcePath.java | 2 +
.../modules/applib-cm/examples/value/Markup.java | 2 +
.../examples/value/NamedWithMimeType.java | 2 +
.../modules/applib-cm/examples/value/Password.java | 2 +
.../applib-svc/examples/services/HasUniqueId.java | 4 +
.../applib-svc/examples/services/HasUsername.java | 4 +-
.../examples/services/WithTransactionScope.java | 2 +
.../examples/services/metrics/MetricsService.java | 4 +
.../services/publish/PublishedObjects.java | 3 -
.../services/publish/PublisherService.java | 2 +
.../queryresultscache/QueryResultsCache.java | 14 +-
.../services/registry/ServiceRegistry.java | 40 ++++-
.../examples/services/repository/EntityState.java | 8 +-
.../services/repository/RepositoryService.java | 35 +++-
.../examples/services/routing/RoutingService.java | 1 -
.../examples/services/scratchpad/Scratchpad.java | 12 +-
.../services/session/SessionLoggingService.java | 11 +-
.../examples/services/sudo/SudoService.java | 40 +++--
.../examples/services/swagger/SwaggerService.java | 26 ++-
.../services/tablecol/TableColumnOrderService.java | 3 -
.../examples/services/title/TitleService.java | 4 +
.../services/urlencoding/UrlEncodingService.java | 1 +
.../examples/services/user/UserService.java | 2 +
.../services/userprof/UserProfileService.java | 2 +
.../services/userreg/EmailNotificationService.java | 8 +-
.../examples/services/userreg/UserDetails.java | 3 +-
.../examples/services/wrapper/WrapperFactory.java | 106 +++++++++---
.../examples/services/wrapper/WrappingObject.java | 11 +-
.../services/wrapper/events/InteractionEvent.java | 2 +-
.../examples/services/xactn/Transaction.java | 2 +
.../examples/services/xactn/TransactionId.java | 12 +-
.../services/xactn/TransactionService.java | 26 ++-
.../examples/services/xactn/TransactionState.java | 24 ++-
.../services/xmlsnapshot/XmlSnapshotService.java | 24 ++-
.../org/apache/isis/applib/AbstractViewModel.java | 2 +
.../apache/isis/applib/ApplicationException.java | 2 +
.../org/apache/isis/applib/FatalException.java | 2 +
.../java/org/apache/isis/applib/Identifier.java | 2 +
.../isis/applib/NonRecoverableException.java | 2 +
.../apache/isis/applib/PersistFailedException.java | 2 +
.../apache/isis/applib/RecoverableException.java | 2 +
.../isis/applib/RecreatableDomainObject.java | 2 +
.../apache/isis/applib/RepositoryException.java | 2 +
.../java/org/apache/isis/applib/ViewModel.java | 2 +
.../isis/applib/adapters/DefaultsProvider.java | 4 +
.../isis/applib/adapters/EncoderDecoder.java | 8 +-
.../isis/applib/adapters/EncodingException.java | 2 +
.../org/apache/isis/applib/adapters/Parser.java | 14 ++
.../isis/applib/adapters/ParsingException.java | 2 +
.../applib/adapters/ValueSemanticsProvider.java | 8 +
.../org/apache/isis/applib/annotation/Action.java | 61 ++++---
.../isis/applib/annotation/ActionLayout.java | 51 +++---
.../apache/isis/applib/annotation/Auditing.java | 15 ++
.../isis/applib/annotation/BookmarkPolicy.java | 17 +-
.../apache/isis/applib/annotation/Bounding.java | 2 +
.../apache/isis/applib/annotation/Collection.java | 39 +++--
.../isis/applib/annotation/CollectionLayout.java | 44 ++---
.../isis/applib/annotation/CommandExecuteIn.java | 22 +--
.../isis/applib/annotation/CommandPersistence.java | 16 +-
.../isis/applib/annotation/CommandReification.java | 15 ++
.../apache/isis/applib/annotation/Constants.java | 27 ---
.../apache/isis/applib/annotation/Contributed.java | 20 ++-
.../apache/isis/applib/annotation/Defaulted.java | 6 +
.../isis/applib/annotation/DomainObject.java | 82 +++++----
.../isis/applib/annotation/DomainObjectLayout.java | 56 ++++---
.../isis/applib/annotation/DomainService.java | 23 ++-
.../applib/annotation/DomainServiceLayout.java | 17 +-
.../org/apache/isis/applib/annotation/Editing.java | 14 ++
.../isis/applib/annotation/EqualByContent.java | 7 +-
.../org/apache/isis/applib/annotation/Facets.java | 7 +
.../apache/isis/applib/annotation/HomePage.java | 2 +
.../isis/applib/annotation/LabelPosition.java | 9 +-
.../apache/isis/applib/annotation/MemberOrder.java | 6 +
.../applib/annotation/MementoSerialization.java | 12 ++
.../apache/isis/applib/annotation/MinLength.java | 3 +-
.../org/apache/isis/applib/annotation/Mixin.java | 6 +
.../org/apache/isis/applib/annotation/Module.java | 5 +-
.../org/apache/isis/applib/annotation/Nature.java | 29 +++-
.../isis/applib/annotation/NatureOfService.java | 31 ++--
.../apache/isis/applib/annotation/Navigable.java | 9 +-
.../apache/isis/applib/annotation/Optionality.java | 27 ++-
.../isis/applib/annotation/OrderPrecedence.java | 13 ++
.../apache/isis/applib/annotation/Parameter.java | 32 ++--
.../isis/applib/annotation/ParameterLayout.java | 24 ++-
.../isis/applib/annotation/Programmatic.java | 13 +-
.../apache/isis/applib/annotation/Projecting.java | 8 +
.../apache/isis/applib/annotation/PromptStyle.java | 27 ++-
.../apache/isis/applib/annotation/Property.java | 92 +++++-----
.../isis/applib/annotation/PropertyLayout.java | 26 ++-
.../apache/isis/applib/annotation/Publishing.java | 15 ++
.../applib/annotation/PublishingChangeKind.java | 8 +-
.../apache/isis/applib/annotation/Redirect.java | 10 ++
.../apache/isis/applib/annotation/RenderDay.java | 12 +-
.../apache/isis/applib/annotation/Repainting.java | 10 ++
.../apache/isis/applib/annotation/RestrictTo.java | 6 +
.../apache/isis/applib/annotation/SemanticsOf.java | 35 +++-
.../org/apache/isis/applib/annotation/Title.java | 16 +-
.../org/apache/isis/applib/annotation/Value.java | 6 +
.../apache/isis/applib/annotation/ViewModel.java | 2 +-
.../isis/applib/annotation/ViewModelLayout.java | 55 +++---
.../org/apache/isis/applib/annotation/Where.java | 65 ++++++++
.../apache/isis/applib/client/SuppressionType.java | 48 ++++--
.../isis/applib/events}/EventObjectBase.java | 20 ++-
.../applib/events/domain/AbstractDomainEvent.java | 185 +++++++++++++--------
.../applib/events/domain/ActionDomainEvent.java | 152 +++++++----------
.../events/domain/CollectionDomainEvent.java | 62 +++----
.../applib/events/domain/PropertyDomainEvent.java | 55 +++---
.../events/lifecycle/AbstractLifecycleEvent.java | 6 +-
.../events/lifecycle/ObjectCreatedEvent.java | 23 +--
.../applib/events/lifecycle/ObjectLoadedEvent.java | 25 +--
.../events/lifecycle/ObjectPersistedEvent.java | 24 +--
.../events/lifecycle/ObjectPersistingEvent.java | 22 +--
.../events/lifecycle/ObjectRemovingEvent.java | 22 +--
.../events/lifecycle/ObjectUpdatedEvent.java | 22 +--
.../events/lifecycle/ObjectUpdatingEvent.java | 22 +--
.../isis/applib/events/ui/AbstractUiEvent.java | 11 +-
.../isis/applib/events/ui/CssClassUiEvent.java | 56 ++++---
.../isis/applib/events/ui/LayoutUiEvent.java | 64 ++++---
.../apache/isis/applib/events/ui/TitleUiEvent.java | 45 ++---
.../java/org/apache/isis/applib/graph/Edge.java | 7 +-
.../org/apache/isis/applib/graph/SimpleEdge.java | 2 +
.../java/org/apache/isis/applib/graph/Vertex.java | 15 +-
.../jaxbadapters/PersistentEntitiesAdapter.java | 22 ++-
.../jaxbadapters/PersistentEntityAdapter.java | 15 +-
.../java/org/apache/isis/applib/query/Query.java | 24 ++-
.../apache/isis/applib/security/RoleMemento.java | 27 ++-
.../apache/isis/applib/security/UserMemento.java | 73 ++++----
.../apache/isis/applib/services/HasUniqueId.java | 4 +
.../apache/isis/applib/services/HasUsername.java | 4 +-
.../isis/applib/services/WithTransactionScope.java | 2 +
.../applib/services/metrics/MetricsService.java | 4 +
.../applib/services/publish/PublishedObjects.java | 3 -
.../applib/services/publish/PublisherService.java | 2 +
.../queryresultscache/QueryResultsCache.java | 14 +-
.../applib/services/registry/ServiceRegistry.java | 40 ++++-
.../applib/services/repository/EntityState.java | 8 +-
.../services/repository/RepositoryService.java | 35 +++-
.../applib/services/routing/RoutingService.java | 1 -
.../applib/services/scratchpad/Scratchpad.java | 12 +-
.../services/session/SessionLoggingService.java | 11 +-
.../isis/applib/services/sudo/SudoService.java | 40 +++--
.../applib/services/swagger/SwaggerService.java | 26 ++-
.../services/tablecol/TableColumnOrderService.java | 3 -
.../isis/applib/services/title/TitleService.java | 4 +
.../services/urlencoding/UrlEncodingService.java | 1 +
.../isis/applib/services/user/UserService.java | 2 +
.../services/userprof/UserProfileService.java | 2 +
.../services/userreg/EmailNotificationService.java | 8 +-
.../isis/applib/services/userreg/UserDetails.java | 3 +-
.../applib/services/wrapper/WrapperFactory.java | 106 +++++++++---
.../applib/services/wrapper/WrappingObject.java | 11 +-
.../services/wrapper/events/InteractionEvent.java | 2 +-
.../isis/applib/services/xactn/Transaction.java | 2 +
.../isis/applib/services/xactn/TransactionId.java | 12 +-
.../applib/services/xactn/TransactionService.java | 26 ++-
.../applib/services/xactn/TransactionState.java | 24 ++-
.../services/xmlsnapshot/XmlSnapshotService.java | 24 ++-
.../snapshot/SnapshottableWithInclusions.java | 5 +
.../isis/applib/spec/AbstractSpecification2.java | 2 +
.../org/apache/isis/applib/spec/Specification.java | 7 +-
.../apache/isis/applib/spec/Specification2.java | 7 +-
.../apache/isis/applib/spec/SpecificationAnd.java | 2 +
.../apache/isis/applib/spec/SpecificationNot.java | 2 +
.../apache/isis/applib/spec/SpecificationOr.java | 4 +-
.../apache/isis/applib/types/DescriptionType.java | 10 +-
.../isis/applib/types/MemberIdentifierType.java | 8 +-
.../apache/isis/applib/types/TargetActionType.java | 10 +-
.../apache/isis/applib/types/TargetClassType.java | 10 +-
.../java/org/apache/isis/applib/util/Enums.java | 5 +-
.../java/org/apache/isis/applib/util/JaxbUtil.java | 4 +-
.../java/org/apache/isis/applib/value/Blob.java | 2 +
.../java/org/apache/isis/applib/value/Clob.java | 2 +
.../java/org/apache/isis/applib/value/Image.java | 2 +
.../isis/applib/value/LocalResourcePath.java | 2 +
.../java/org/apache/isis/applib/value/Markup.java | 2 +
.../isis/applib/value/NamedWithMimeType.java | 2 +
.../org/apache/isis/applib/value/Password.java | 2 +
.../core/metamodel/facets/DomainEventHelper.java | 2 +-
.../transaction/ChangedObjectsService.java | 5 +-
.../userreg/EmailNotificationServiceDefault.java | 1 -
.../runtimeservices/wrapper/AsyncWrapDefault.java | 20 +--
.../wrapper/WrapperFactoryDefault.java | 8 +-
.../commons/internal/reflection/ReflectTest.java | 9 +-
.../wrapper/WrapperFactoryDefaultTest.java | 12 +-
.../testdomain/auditing/AuditerServiceTest.java | 5 +-
.../publishing/PublisherServiceTest.java | 5 +-
.../applib/events/FixturesInstalledEvent.java | 2 +-
.../applib/events/FixturesInstallingEvent.java | 2 +-
272 files changed, 3565 insertions(+), 1884 deletions(-)
diff --cc api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
index 3fe1bbd,bf5bee4..66ece7f
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
@@@ -43,10 -43,14 +43,14 @@@ import org.apache.isis.applib.events.li
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see <code>org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring</code>
+ * For more details see <code>org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring</code>
*/
+ // tag::refguide[]
@Inherited
- @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
+ @Target({
+ ElementType.TYPE,
+ ElementType.ANNOTATION_TYPE
+ })
@Retention(RetentionPolicy.RUNTIME)
@Component @Scope("prototype")
public @interface DomainObject {
diff --cc api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
index 690e4b6,02b2cee..a57ab75
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
@@@ -38,11 -38,15 +38,15 @@@ import org.springframework.stereotype.S
*
* @apiNote Meta annotation {@link Service} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see {@link org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring}.
+ * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
*
*/
+ // tag::refguide[]
@Inherited
- @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
+ @Target({
+ ElementType.TYPE,
+ ElementType.ANNOTATION_TYPE
+ })
@Retention(RetentionPolicy.RUNTIME)
@Service @Singleton
public @interface DomainService {
diff --cc api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Mixin.java
index 2c4a18d,5d8d41c..2b92093
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Mixin.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Mixin.java
@@@ -34,8 -34,9 +34,9 @@@ import org.springframework.stereotype.C
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see {@link org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring}.
+ * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
*/
+ // tag::refguide[]
@Inherited
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --cc api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index 3fe1bbd,bf5bee4..66ece7f
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@@ -43,10 -43,14 +43,14 @@@ import org.apache.isis.applib.events.li
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see <code>org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring</code>
+ * For more details see <code>org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring</code>
*/
+ // tag::refguide[]
@Inherited
- @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
+ @Target({
+ ElementType.TYPE,
+ ElementType.ANNOTATION_TYPE
+ })
@Retention(RetentionPolicy.RUNTIME)
@Component @Scope("prototype")
public @interface DomainObject {
diff --cc api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 690e4b6,02b2cee..a57ab75
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@@ -38,11 -38,15 +38,15 @@@ import org.springframework.stereotype.S
*
* @apiNote Meta annotation {@link Service} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see {@link org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring}.
+ * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
*
*/
+ // tag::refguide[]
@Inherited
- @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
+ @Target({
+ ElementType.TYPE,
+ ElementType.ANNOTATION_TYPE
+ })
@Retention(RetentionPolicy.RUNTIME)
@Service @Singleton
public @interface DomainService {
diff --cc api/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
index 2c4a18d,5d8d41c..2b92093
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Mixin.java
@@@ -34,8 -34,9 +34,9 @@@ import org.springframework.stereotype.C
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see {@link org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring}.
+ * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
*/
+ // tag::refguide[]
@Inherited
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --cc api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
index d7923a6,8c4b8c7..1520574
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ViewModel.java
@@@ -51,11 -51,16 +51,11 @@@ import org.springframework.stereotype.C
* @see ViewModel
*
* @apiNote Meta annotation {@link Component} allows for the Spring framework to pick up (discover) the
- * annotated type.
- *
- * For more details see <code>org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring</code>.
+ * annotated type.
- * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
++ * For more details see <code>org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring</code>.
*/
-// tag::refguide[]
@Inherited
-@Target({
- ElementType.TYPE,
- ElementType.ANNOTATION_TYPE
-})
+@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Component @Scope("prototype")
public @interface ViewModel {
diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
index dd32457,63d2177..b9de7eb
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
@@@ -52,11 -52,12 +52,12 @@@ import lombok.extern.log4j.Log4j2
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
-@RequestScoped
+@IsisSessionScope
@Log4j2
+ // tag::refguide[]
public class ChangedObjectsService implements WithTransactionScope {
- // end::refguide[]
+ // end::refguide[]
public ChangedObjectsService() {
log.debug("init");
}
diff --cc examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index f075ed9,9f05b5a..c88ff4c
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@@ -43,8 -43,8 +43,7 @@@ import static org.junit.jupiter.api.Ass
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
- import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.metamodel.services.publishing.PublisherDispatchService;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;