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 2020/02/20 07:55:45 UTC
[isis] 03/14: ISIS-2062: refguide docs (wip)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0c5fd446df2fa014478cc686bf6823f12cf69819
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 19 22:35:18 2020 +0000
ISIS-2062: refguide docs (wip)
---
.../2018/2.0.0-M1/mignotes/legacy-modules.adoc | 1 +
.../framework-provided.adoc | 5 +-
.../modules/applib-ant/pages/PostConstruct.adoc | 2 +-
.../applib-cm/pages/classes/contributee.adoc | 2 +-
.../{HasTransactionId.adoc => HasUniqueId.adoc} | 12 ++--
.../modules/applib-svc/pages/AuditerService.adoc | 2 +-
.../applib-svc/pages/AuditerServiceLogging.adoc | 1 +
...ution.adoc => _BackgroundCommandExecution.adoc} | 0
.../{Quartz.adoc => _Quartz.adoc} | 0
.../adoc/modules/applib-svc/pages/Bookmark.adoc | 1 +
.../applib-svc/pages/BookmarkHolder_lookup.adoc | 1 +
.../applib-svc/pages/BookmarkHolder_object.adoc | 1 +
.../pages/CatalogingSchemaOutputResolver.adoc | 1 +
.../applib-svc/pages/ClassDiscoveryService.adoc | 53 --------------
.../adoc/modules/applib-svc/pages/Command.adoc | 1 +
.../modules/applib-svc/pages/CommandContext.adoc | 2 +-
.../applib-svc/pages/CommandDtoProcessor.adoc | 1 +
.../pages/CommandDtoProcessorService.adoc | 1 +
.../applib-svc/pages/CommandExecutorService.adoc | 2 +-
.../modules/applib-svc/pages/CommandService.adoc | 2 +-
.../modules/applib-svc/pages/CommandWithDto.adoc | 1 +
.../applib-svc/pages/ConfigurationMenu.adoc | 1 +
.../applib-svc/pages/ConfigurationProperty.adoc | 1 +
.../applib-svc/pages/ConfigurationService.adoc | 80 ----------------------
.../pages/ContentMappingServiceForCommandDto.adoc | 1 +
.../pages/ContentMappingServiceForCommandsDto.adoc | 1 +
.../modules/applib-svc/pages/DomainMember.adoc | 1 +
.../adoc/modules/applib-svc/pages/DomainModel.adoc | 1 +
.../modules/applib-svc/pages/DtoMappingHelper.adoc | 26 -------
.../adoc/modules/applib-svc/pages/EntityState.adoc | 1 +
.../modules/applib-svc/pages/ErrorDetails.adoc | 1 +
.../pages/ExceptionRecognizerForType.adoc | 1 +
.../pages/ExceptionRecognizerService.adoc | 1 +
.../adoc/modules/applib-svc/pages/Interaction.adoc | 1 +
.../applib-svc/pages/InteractionContext.adoc | 2 +-
.../applib-svc/pages/LayoutServiceMenu.adoc | 1 +
...etamodelService.adoc => MetaModelService_.adoc} | 0
.../applib-svc/pages/MetaModelServicesMenu.adoc | 1 +
.../modules/applib-svc/pages/PublishedObjects.adoc | 1 +
.../modules/applib-svc/pages/PublisherService.adoc | 4 +-
.../applib-svc/pages/PublisherServiceLogging.adoc | 1 +
.../applib-svc/pages/QueryResultsCacheControl.adoc | 1 +
.../applib-svc/pages/QueryResultsCacheDefault.adoc | 1 +
.../modules/applib-svc/pages/ServiceInjector.adoc | 1 +
.../applib-svc/pages/SwitchUserService.adoc | 40 -----------
.../adoc/modules/applib-svc/pages/Transaction.adoc | 1 +
.../modules/applib-svc/pages/TransactionId.adoc | 1 +
.../applib-svc/pages/TransactionService.adoc | 2 +-
.../modules/applib-svc/pages/TransactionState.adoc | 1 +
.../applib-svc/pages/TranslatableString.adoc | 1 +
.../pages/UrlEncodingServiceWithCompression.adoc | 1 +
.../modules/applib-svc/pages/WrappingObject.adoc | 1 +
...kgroundService.adoc => _BackgroundService.adoc} | 0
...rvice.adoc => _ExecutionParametersService.adoc} | 0
.../{FixtureScripts.adoc => _FixtureScripts.adoc} | 0
...c => _FixtureScriptsSpecificationProvider.adoc} | 0
.../{H2ManagerMenu.adoc => _H2ManagerMenu.adoc} | 0
...rService.adoc => _HomePageProviderService.adoc} | 0
...lDbManagerMenu.adoc => _HsqlDbManagerMenu.adoc} | 0
...sConfiguration.adoc => _IsisConfiguration.adoc} | 0
.../{IsisJdoSupport.adoc => _IsisJdoSupport.adoc} | 0
...nvironment.adoc => _IsisSystemEnvironment.adoc} | 0
.../{MementoService.adoc => _MementoService.adoc} | 0
.../main/adoc/modules/applib-svc/pages/about.adoc | 1 -
.../applib-svc/partials/application-layer-api.adoc | 9 ---
.../applib-svc/partials/bootstrapping-spi.adoc | 44 ------------
.../applib-svc/partials/core-domain-api.adoc | 12 ----
.../modules/applib-svc/partials/module-nav.adoc | 26 +++----
.../adoc/modules/applib-svc/partials/testing.adoc | 11 ---
.../isis/applib/services/error/ErrorDetails.java | 2 +-
.../action/ActionAnnotationFacetFactory.java | 4 +-
.../DomainObjectAnnotationFacetFactory.java | 4 +-
.../property/PropertyAnnotationFacetFactory.java | 6 +-
.../metamodel/services/ServiceInjectorDefault.java | 17 ++---
.../ApplicationFeatureRepositoryDefault.java | 24 +++----
.../isis/core/metamodel/spec/ManagedObject.java | 9 ++-
.../commons/internal/reflection/ReflectTest.java | 12 ----
.../action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../ActionAnnotationFacetFactoryTest_Command.java | 6 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 6 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
.../adoc/modules/shiro/pages/about/run-as.adoc | 1 -
83 files changed, 108 insertions(+), 366 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc
index 8a09e09..6ef46eb 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc
@@ -3,6 +3,7 @@
:page-partial:
+WARNING: TODO: v2 - these mignotes themselves are out of date...
Deprecated types have been moved into new "legacy" modules.
For example, applib types have been moved into `org.apache.isis.core:isis-core-applib-legacy` module.
diff --git a/api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc b/api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
index 28c1817..d84c822 100644
--- a/api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
+++ b/api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
@@ -4,6 +4,8 @@
:page-partial:
+WARNING: TODO: v2: remove this page, instead just xref:refguide:applib-svc:about.adoc[ref guide domain services].
+
Most framework domain services are API: they exist to provide support functionality to the application's domain objects and services.
In this case an implementation of the service will be available, either in Apache Isis core or as an extension.
@@ -93,9 +95,6 @@ Other API:
* xref:refguide:applib-svc:testing/SudoService.adoc[`SudoService`]
* xref:refguide:applib-svc:application-layer-api/TransactionService.adoc[`TransactionService`]
-Other SPI:
-
-* xref:refguide:applib-svc:bootstrapping-spi/ClassDiscoveryService.adoc[`ClassDiscoveryService`] (SPI)
Extensions:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc
index bb4a249..f64ca8d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc
@@ -1,7 +1,7 @@
= `@PostConstruct` (`javax`)
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2 - the init with args is no longer supported; instead use IsisConfiguration injected.
+WARNING: TODO: v2 - the init with args is no longer supported; instead use IsisConfiguration injected or any Spring Boot `@ConfigurationProperties` class.
The `@javax.annotation.PostConstruct` annotation, as defined in link:https://jcp.org/en/jsr/detail?id=250[JSR-250], is recognized by Apache Isis as a callback method on domain services to be called just after they have been constructed, in order that they initialize themselves.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
index 489416e..a438bfe 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
+++ b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
@@ -7,5 +7,5 @@ The interfaces listed in this chapter act as contributees; they allow domain ser
-include::contributee/HasTransactionId.adoc[leveloffset=+1]
+include::contributee/HasUniqueId.adoc[leveloffset=+1]
include::contributee/HasUserName.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasUniqueId.adoc
similarity index 91%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasUniqueId.adoc
index 1515a98..780466c 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
+++ b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasUniqueId.adoc
@@ -1,10 +1,10 @@
-[[HasTransactionId]]
-= `HasTransactionId`
+[[HasUniqueId]]
+= `HasUniqueId`
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-The `HasTransactionId` interface is a mix-in for any domain objects that reference a transaction id, such as
+The `HasUniqueId` interface is a mix-in for any domain objects that reference a transaction id, such as
auditing entries or commands, or for xref:refguide:applib-svc:application-layer-api/InteractionContext.adoc[``Interaction`]s persisted as published events.
[NOTE]
@@ -16,7 +16,7 @@ The interface is defined is:
[source,java]
----
-public interface HasTransactionId {
+public interface HasUniqueId {
public UUID getTransactionId(); // <1>
public void setTransactionId(final UUID transactionId);
}
@@ -33,11 +33,11 @@ Modules in the (non-ASF) link:https://platform.incode.org[Incode Platform^] that
== `RepresentsInteractionMemberExecution`
-The `RepresentsInteractionMemberExecution` interface is a sub-interface of `HasTransactionId` that also includes a sequence property:
+The `RepresentsInteractionMemberExecution` interface is a sub-interface of `HasUniqueId` that also includes a sequence property:
[source,java]
----
-public interface RepresentsInteractionMemberExecution extends HasTransactionId {
+public interface RepresentsInteractionMemberExecution extends HasUniqueId {
int getSequence();
}
----
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
index bba58dc..7fef201 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
@@ -88,7 +88,7 @@ the secondary menu bar.
* `AuditingServiceRepository` service to to search for persisted `AuditEntry``s.
None of its actions are visible in the user interface (they are all `@Programmatic`).
-* `AuditingServiceContributions` which contributes collections to the xref:refguide:applib-cm:classes/mixins.adoc#HasTransactionId[ `HasTransactionId`] interface.
+* `AuditingServiceContributions` which contributes collections to the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[ `HasUniqueId`] interface.
This will therefore display all audit entries that occurred in a given request/transaction, in other words whenever a command, a published event or another audit entry is displayed.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerServiceLogging.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerServiceLogging.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerServiceLogging.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/BackgroundCommandExecution.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/_BackgroundCommandExecution.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/BackgroundCommandExecution.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/_BackgroundCommandExecution.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/Quartz.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/_Quartz.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/Quartz.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService/_Quartz.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Bookmark.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/Bookmark.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/Bookmark.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_lookup.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_lookup.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_lookup.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_object.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_object.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkHolder_object.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CatalogingSchemaOutputResolver.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CatalogingSchemaOutputResolver.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CatalogingSchemaOutputResolver.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ClassDiscoveryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ClassDiscoveryService.adoc
deleted file mode 100644
index 6c88067..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ClassDiscoveryService.adoc
+++ /dev/null
@@ -1,53 +0,0 @@
-[[ClassDiscoveryService]]
-= `ClassDiscoveryService`
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-
-The `ClassDiscoveryService` service (and its various supertypes) is used to automatically discover subclasses of any given type on the classpath.
-The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.
-
-This service is used by the xref:refguide:applib-cm:classes/super.adoc#FixtureScripts[`FixtureScripts`] service to automatically locate any xref:refguide:applib-cm:classes/super.adoc#FixtureScript[`FixtureScript`] implementations.
-
-
-
-== SPI
-
-The SPI defined by the service is:
-
-[source,java]
-----
-public interface ClassDiscoveryService {
- @Programmatic
- <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type, String packagePrefix);
- @Deprecated
- @Programmatic
- <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type); // <1>
-}
-----
-<1> no longer used
-
-
-
-== Implementation
-
-Apache Isis provides an implementation of this service, namely `o.a.i.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections`.
-
-[NOTE]
-====
-This implementation is also used to discover domain services annotated with xref:refguide:applib-ant:DomainService.adoc[`@DomainService`].
-Currently this logic uses the implementation directly, so is not pluggable.
-====
-
-To use an alternative implementation, implement the `ClassDiscoveryService` interface and use Spring's link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation (as explained in the xref:refguide:applib-svc:about.adoc#overriding-the-services.adoc[introduction] to this guide).
-
-
-
-
-
-== Related Services
-
-The xref:refguide:applib-svc:.FixtureScripts.adoc[`FixtureScripts`] domain service uses `ClassDiscoveryService` to discover ``FixtureScript``s implementations to present in the UI.
-
-Note that the bootstrapping of the framework itself does _not_ use this service (though it does use the same underlying library as the default implementation of this service, namely `org.reflections.Reflections`).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Command.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/Command.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/Command.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandContext.adoc
index b76f504..881786b 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandContext.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandContext.adoc
@@ -65,7 +65,7 @@ The `Command` type referenced above is in fact an interface, defined as:
[source,java]
----
-public interface Command extends HasTransactionId {
+public interface Command extends HasUniqueId {
public abstract String getUser(); // <1>
public abstract Timestamp getTimestamp(); // <2>
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessor.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessor.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessor.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService.adoc
index f0de859..049b170 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService.adoc
@@ -36,7 +36,7 @@ Behind the scenes this uses the xref:refguide:applib-svc:.SudoService.adoc[`Sudo
<2> provided `Command` must implement `CommandDto`.
When the `Command` is executed, it will also be returned by xref:refguide:applib-svc:.CommandContext.adoc[`CommandContext`].
-Any associated objects that implement `HasTransactionId` (audit entries and the like) will therefore have the correct transactionId and will correctly be associated with the `Command` being executed.
+Any associated objects that implement `HasUniqueId` (audit entries and the like) will therefore have the correct transactionId and will correctly be associated with the `Command` being executed.
The framework provides a default implementation of this service,
`o.a.i.core.runtime.services.background.CommandExecutorServiceDefault`
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
index 9f3d0bd..b583896 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
@@ -103,5 +103,5 @@ The `CommandService` captures the __cause__ of an interaction (an action was inv
You may also want to configure the xref:refguide:applib-svc:.PublisherService.adoc[`PublisherService`].
-All three of these services collaborate implicitly by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasTransactionId[`HasTransactionId`] interface.
+All three of these services collaborate implicitly by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandWithDto.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandWithDto.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandWithDto.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationProperty.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationProperty.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationProperty.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationService.adoc
deleted file mode 100644
index 80848fb..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationService.adoc
+++ /dev/null
@@ -1,80 +0,0 @@
-[[ConfigurationService]]
-= `ConfigurationService`
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-WARNING: TODO: v2: this has been replaced, probably need to describe or x-ref Spring properties.
-
-
-
-The `ConfigurationService` allows domain objects to read the configuration properties aggregated from the various xref:refguide:config:configuration-files.adoc[configuration files].
-
-
-[IMPORTANT]
-====
-Only configuration properties with the prefix "application" are be exposed.
-====
-
-
-
-== API and Usage
-
-The API of `ConfigurationService` is:
-
-[source,java]
-----
-public interface ConfigurationService {
-
- String getProperty(String name); // <1>
- String getProperty(String name, String defaultValue); // <2>
- List<String> getPropertyNames(); // <3>
- Set<ConfigurationProperty> allProperties(); // <4>
-
-}
-----
-<1> Return the configuration property with the specified name; else return null.
-<2> Return the configuration property with the specified name; if it doesn't exist then return the specified default value.
-<3> Return the names of all the available properties.
-<4> Returns all properties, each as an instance of the `ConfigurationProperty` view model.
-
-For example, here's a fictitious service that might wrap link:http://twitter4j.org/en/configuration.html[Twitter4J]. say:
-
-[source,java]
-----
-@DomainService(nature=NatureOfService.DOMAIN)
-public class TweetService {
- @Programmatic
- @PostConstruct
- public void init() {
- this.oauthConsumerKey = configurationService.getProperty("application.tweetservice.oauth.consumerKey");
- this.oauthConsumerSecret = configurationService.getProperty("application.tweetservice.oauth.consumerSecret");
- this.oauthAccessToken = configurationService.getProperty("application.tweetservice.oauth.accessToken");
- this.oauthAccessTokenSecret = configurationService.getProperty("application.tweetservice.oauth.accessTokenSecret");
- }
- ...
- @Inject
- ConfigurationService configurationService;
-}
-----
-
-[TIP]
-====
-If you _do_ have a domain service that needs to access Isis properties, then an alternative is to define a xref:refguide:applib-ant:PostConstruct.adoc[`@PostConstruct`] method and pass in a `Map<String,String>` of properties.
-This is provided all properties, not just those with the 'application' prefix.
-====
-
-
-
-
-
-== Implementation
-
-The core framework provides a default implementation of this service (`o.a.i.core.runtime.services.config.ConfigurationServiceDefault`).
-
-
-
-
-== Related services
-
-The ``ConfigurationServiceMenu`` exposes the ``allConfigurationProperties`` action in the user interface.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandDto.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandDto.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandDto.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandsDto.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandsDto.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingServiceForCommandsDto.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DomainMember.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/DomainMember.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/DomainMember.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DomainModel.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/DomainModel.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/DomainModel.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DtoMappingHelper.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/DtoMappingHelper.adoc
deleted file mode 100644
index 8cdd702..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/DtoMappingHelper.adoc
+++ /dev/null
@@ -1,26 +0,0 @@
-[[DtoMappingHelper]]
-= `DtoMappingHelper`
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-The `DtoMappingHelper` converts the domain object's internal identifier into a serializable `OidDto` for use in the xref:refguide:schema:cmd[command] and xref:refguide:schema:about.adoc#ixn.adoc[interaction] schemas.
-
-
-== API and Usage
-
-The API of `DtoMappingHelper` is:
-
-[source,java]
-----
-public class DtoMappingHelper {
-
- public OidDto oidDtoFor(final Object object) { /* ... */ } // <1>
-}
-----
-<1> Uses the xref:refguide:applib-svc:.BookmarkService.adoc[`BookmarkService`] to convert the domain object's internal identifier into a serializable `OidDto`.
-
-This class (`o.a.i.applib.services.dto.DtoMappingHelper`) is also the implementation.
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EntityState.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/EntityState.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/EntityState.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorDetails.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorDetails.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorDetails.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerForType.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerForType.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerForType.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Interaction.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/Interaction.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/Interaction.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
index e132dfa..afe24c6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
@@ -26,7 +26,7 @@ time)
* if auditing is configured (using xref:refguide:applib-svc:.AuditerService.adoc[`AuditerService`]), they provide better audit information, since the
`Interaction.Execution` captures the 'cause' of an interaction and can be correlated to the audit records (the "effect"
-of the interaction) by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasTransactionId[`transactionId`]
+of the interaction) by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`transactionId`]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetamodelService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService_.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetamodelService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService_.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServicesMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServicesMenu.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServicesMenu.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/PublishedObjects.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/PublishedObjects.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/PublishedObjects.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
index b83b4ef..2b18566 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
@@ -38,7 +38,7 @@ The full API of `PublishedObjects` itself is:
[source,java]
----
-public interface PublishedObjects extends HasTransactionId, HasUsername {
+public interface PublishedObjects extends HasUniqueId, HasUsername {
UUID getTransactionId(); // <1>
String getUsername(); // <2>
Timestamp getCompletedAt(); // <3>
@@ -51,7 +51,7 @@ public interface PublishedObjects extends HasTransactionId, HasUsername {
int getNumberPropertiesModified();
}
----
-<1> inherited from `HasTransactionId`, correlates back to the unique identifier of the transaction in which these objects were changed.
+<1> inherited from `HasUniqueId`, correlates back to the unique identifier of the transaction in which these objects were changed.
<2> inherited from `HasUsername`, is the user that initiated the transaction causing these objects to change
<3> the time that this set of objects was collated (just before the completion of the transaction completes)..
<4> returns a DTO (as per the xref:refguide:schema:chg.adoc["chg" schema]) which can be converted into a serializable XML representation can be obtained using the `ChangesDtoUtils` utility class.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherServiceLogging.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherServiceLogging.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherServiceLogging.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheDefault.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheDefault.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheDefault.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SwitchUserService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/SwitchUserService.adoc
deleted file mode 100644
index 76405ad..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/SwitchUserService.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-[SwitchUserService]
-= `SwitchUserService` (deprecated)
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-
-The `SwitchUserService` domain service provides the ability to install fixtures changing the effective user half-way
-through. For example, this allows the setup of a test of a workflow system which checks that work is moved between
-different users of the system.
-
-
-[NOTE]
-====
-This service is deprecated; use xref:fixtures:ROOT:about.adoc[fixture scripts] and the
-xref:refguide:applib-svc:.SudoService.adoc[`SudoService`] instead.
-====
-
-
-
-== API
-
-The API of this service:
-
-[source,java]
-----
-public class SwitchUserService {
- void switchUser(String username, String... roles); // <1>
- void switchUser(String username, List<String> roles); // <1>
-}
-----
-<1> Switches the current user with the list of specified roles.
-
-
-
-
-
-== Implementation
-
-The framework provides a default implementation of this service: `SwitchUserServiceImpl` in `isis-core-runtime`
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Transaction.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/Transaction.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/Transaction.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionId.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionId.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionId.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
index ac2f6e9..71c3fcb 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
@@ -83,7 +83,7 @@ public interface Transaction2 {
}
----
<1> is a unique identifier for the interaction/request, as defined by the
-xref:refguide:applib-cm:classes/mixins.adoc#HasTransactionId[`HasTransactionId`] mixin.
+xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] mixin.
<2> there can actually be multiple transactions within such a request/interaction; the sequence is a (0-based) is used to distinguish such.
<3> as per `TransactionService#flushTransaction()` described above.
<4> The state of this transaction (same as `TransactionService#getTransactionState()`).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionState.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionState.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionState.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslatableString.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslatableString.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslatableString.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingServiceWithCompression.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingServiceWithCompression.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingServiceWithCompression.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/WrappingObject.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/WrappingObject.adoc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/WrappingObject.adoc
@@ -0,0 +1 @@
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_BackgroundService.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BackgroundService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_BackgroundService.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionParametersService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_ExecutionParametersService.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionParametersService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_ExecutionParametersService.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/FixtureScripts.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_FixtureScripts.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/FixtureScripts.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_FixtureScripts.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/FixtureScriptsSpecificationProvider.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_FixtureScriptsSpecificationProvider.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/FixtureScriptsSpecificationProvider.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_FixtureScriptsSpecificationProvider.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/H2ManagerMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_H2ManagerMenu.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/H2ManagerMenu.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_H2ManagerMenu.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HomePageProviderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_HomePageProviderService.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HomePageProviderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_HomePageProviderService.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HsqlDbManagerMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_HsqlDbManagerMenu.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HsqlDbManagerMenu.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_HsqlDbManagerMenu.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/IsisConfiguration.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_IsisConfiguration.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/IsisConfiguration.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_IsisConfiguration.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/IsisJdoSupport.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_IsisJdoSupport.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/IsisJdoSupport.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_IsisJdoSupport.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/IsisSystemEnvironment.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_IsisSystemEnvironment.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/IsisSystemEnvironment.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_IsisSystemEnvironment.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MementoService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/_MementoService.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MementoService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/_MementoService.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
index f3e836e..8f2c8c0 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
@@ -40,7 +40,6 @@ include::refguide:applib-svc:partial$metadata-api.adoc[leveloffset=+2]
include::refguide:applib-svc:partial$testing.adoc[leveloffset=+2]
include::refguide:applib-svc:partial$persistence-layer-api.adoc[leveloffset=+2]
include::refguide:applib-svc:partial$persistence-layer-spi.adoc[leveloffset=+2]
-include::refguide:applib-svc:partial$bootstrapping-spi.adoc[leveloffset=+2]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/application-layer-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/application-layer-api.adoc
index 63d7e70..5e9e24d 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/application-layer-api.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/application-layer-api.adoc
@@ -57,15 +57,6 @@ The xref:refguide:applib-svc:application-layer-api/InteractionContext.adoc[`Inte
|
-|xref:refguide:applib-svc:application-layer-api/DtoMappingHelper.adoc[`o.a.i.applib.` +
-`services.dto` +
-`DtoMappingHelper`]
-|Maps domain objects internal identifier to an `OidDto` for use in serialized representations.
-|`DtoMappingHelper` +
-``o.a.i.core`` +
-``isis-core-applib``
-|API is also a concrete class.
-
|xref:refguide:applib-svc:application-layer-api/InteractionContext.adoc[`o.a.i.applib.` +
`services.iactn` +
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/bootstrapping-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/bootstrapping-spi.adoc
deleted file mode 100644
index 92b42cc..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/bootstrapping-spi.adoc
+++ /dev/null
@@ -1,44 +0,0 @@
-= Bootstrapping SPI
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-Bootstrapping SPIs influence how the framework locates the components that make up the running application.
-
-
-The table below summarizes the bootstrapping SPI 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 (non-ASF) link:https://platform.incode.org[Incode Platform^] modules.
-
-.Bootstrapping SPI
-[cols="2,4a,1,1", options="header"]
-|===
-
-|SPI
-|Description
-|Implementation
-|Notes
-
-
-|xref:refguide:applib-svc:bootstrapping-spi/ClassDiscoveryService.adoc[`o.a.i.applib.` +
-`services.classdiscovery` +
-`ClassDiscoveryService`]
-|Mechanism to locate (from the classpath) classes with a specific annotation (eg xref:refguide:applib-ant:DomainService.adoc[`@DomainService`])
-
-Subtypes of a given type (eg xref:refguide:applib-cm:classes/super.adoc#FixtureScript[`FixtureScript`]).
-|`ClassDiscoveryService-` +
-`UsingReflections` +
-``o.a.i.core`` +
-``isis-core-applib``
-|requires `org.reflections:reflections` as Maven dependency
-
-|===
-
-
-Key:
-
-* `o.a.i` is an abbreviation for `org.apache.isis`
-* `o.ia.m` is an abbreviation for `org.isisaddons.module`
-* `o.a.i.c.m.s` is an abbreviation for `org.apache.isis.core.metamodel.services`
-* `o.a.i.c.r.s` is an abbreviation for `org.apache.isis.core.runtime.services`
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/core-domain-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/core-domain-api.adoc
index 1bc59aa..d05b95a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/core-domain-api.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/core-domain-api.adoc
@@ -31,18 +31,6 @@ It also lists their corresponding implementation, either a default implementatio
-|xref:refguide:applib-svc:core-domain-api/ConfigurationService.adoc[`o.a.i.applib.` +
-`services.config` +
-`ConfigurationService`]
-|Access configuration properties (eg from `application.properties` file)
-|`ConfigurationService-` +
-``Default`` +
-``o.a.i.core`` +
-``isis-core-runtime``
-|The ``ConfigurationServiceMenu`` exposes the ``allConfigurationProperties`` action in the user interface.
-
-
-
|xref:refguide:applib-svc:core-domain-api/EventBusService.adoc[`o.a.i.applib.` +
`services.eventbus` +
`EventBusService`]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc
index 3fc493a..df1fcf1 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc
@@ -4,28 +4,25 @@
** xref:refguide:applib-svc:ApplicationFeatureRepository.adoc[ApplicationFeatureRepository]
** xref:refguide:applib-svc:AuditerService.adoc[AuditerService]
** xref:refguide:applib-svc:BackgroundCommandService.adoc[BackgroundCommandService]
-** xref:refguide:applib-svc:BackgroundService.adoc[BackgroundService]
-*** xref:refguide:applib-svc:BackgroundService/BackgroundCommandExecution.adoc[BackgroundCommandExecution]
-*** xref:refguide:applib-svc:BackgroundService/Quartz.adoc[Quartz]
+** xref:refguide:applib-svc:_BackgroundService.adoc[BackgroundService]
+*** xref:refguide:applib-svc:BackgroundService/_BackgroundCommandExecution.adoc[BackgroundCommandExecution]
+*** xref:refguide:applib-svc:BackgroundService/_Quartz.adoc[Quartz]
** xref:refguide:applib-svc:BookmarkService.adoc[BookmarkService]
** xref:refguide:applib-svc:BookmarkUiService.adoc[BookmarkUiService]
-** xref:refguide:applib-svc:ClassDiscoveryService.adoc[ClassDiscoveryService]
** xref:refguide:applib-svc:ClockService.adoc[ClockService]
** xref:refguide:applib-svc:CommandContext.adoc[CommandContext]
** xref:refguide:applib-svc:CommandService.adoc[CommandService]
-** xref:refguide:applib-svc:ConfigurationService.adoc[ConfigurationService]
** xref:refguide:applib-svc:ConfigurationViewService.adoc[ConfigurationViewService]
** xref:refguide:applib-svc:ContentMappingService.adoc[ContentMappingService]
** xref:refguide:applib-svc:DeepLinkService.adoc[DeepLinkService]
-** xref:refguide:applib-svc:DtoMappingHelper.adoc[DtoMappingHelper]
** xref:refguide:applib-svc:EmailNotificationService.adoc[EmailNotificationService]
** xref:refguide:applib-svc:EmailService.adoc[EmailService]
** xref:refguide:applib-svc:ErrorReportingService.adoc[ErrorReportingService]
** xref:refguide:applib-svc:EventBusService.adoc[EventBusService]
** xref:refguide:applib-svc:ExceptionRecognizer.adoc[ExceptionRecognizer]
-** xref:refguide:applib-svc:ExecutionParametersService.adoc[ExecutionParametersService]
-** xref:refguide:applib-svc:FixtureScripts.adoc[FixtureScripts]
-** xref:refguide:applib-svc:FixtureScriptsSpecificationProvider.adoc[FixtureScriptsSpecificationProvider]
+** xref:refguide:applib-svc:_ExecutionParametersService.adoc[ExecutionParametersService]
+** xref:refguide:applib-svc:_FixtureScripts.adoc[FixtureScripts]
+** xref:refguide:applib-svc:_FixtureScriptsSpecificationProvider.adoc[FixtureScriptsSpecificationProvider]
** xref:refguide:applib-svc:FactoryService.adoc[FactoryService]
** xref:refguide:applib-svc:GridLoaderService.adoc[GridLoaderService]
** xref:refguide:applib-svc:GridService.adoc[GridService]
@@ -33,18 +30,18 @@
** xref:refguide:applib-svc:GuiceBeanProvider.adoc[GuiceBeanProvider]
** xref:refguide:applib-svc:HealthCheckService.adoc[HealthCheckService]
** xref:refguide:applib-svc:HintStore.adoc[HintStore]
-** xref:refguide:applib-svc:HsqlDbManagerMenu.adoc[HsqlDbManagerMenu]
-** xref:refguide:applib-svc:HomePageProviderService.adoc[HomePageProviderService]
+** xref:refguide:applib-svc:_HsqlDbManagerMenu.adoc[HsqlDbManagerMenu]
+** xref:refguide:applib-svc:_HomePageProviderService.adoc[HomePageProviderService]
** xref:refguide:applib-svc:InteractionContext.adoc[InteractionContext]
-** xref:refguide:applib-svc:IsisJdoSupport.adoc[JdoSupport]
+** xref:refguide:applib-svc:_IsisJdoSupport.adoc[JdoSupport]
** xref:refguide:applib-svc:JaxbService.adoc[JaxbService]
** xref:refguide:applib-svc:LayoutService.adoc[LayoutService]
** xref:refguide:applib-svc:LocaleProvider.adoc[LocaleProvider]
-** xref:refguide:applib-svc:MementoService.adoc[MementoService]
+** xref:refguide:applib-svc:_MementoService.adoc[MementoService]
** xref:refguide:applib-svc:MenuBarsLoaderService.adoc[MenuBarsLoaderService]
** xref:refguide:applib-svc:MenuBarsService.adoc[MenuBarsService]
** xref:refguide:applib-svc:MessageService.adoc[MessageService]
-** xref:refguide:applib-svc:MetamodelService.adoc[MetamodelService]
+** xref:refguide:applib-svc:MetaModelService_.adoc[MetamodelService]
** xref:refguide:applib-svc:MetricsService.adoc[MetricsService]
** xref:refguide:applib-svc:PublisherService.adoc[PublisherService]
** xref:refguide:applib-svc:QueryResultsCache.adoc[QueryResultsCache]
@@ -55,7 +52,6 @@
** xref:refguide:applib-svc:ServiceRegistry.adoc[ServiceRegistry]
** xref:refguide:applib-svc:SessionManagementService.adoc[SessionManagementService]
** xref:refguide:applib-svc:SwaggerService.adoc[SwaggerService]
-** xref:refguide:applib-svc:SwitchUserService.adoc[SwitchUserService]
** xref:refguide:applib-svc:SudoService.adoc[SudoService]
** xref:refguide:applib-svc:TableColumnOrderService.adoc[TableColumnOrderService]
** xref:refguide:applib-svc:TranslationService.adoc[TranslationService]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/testing.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/testing.adoc
index 6833842..e6c6443 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/testing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/testing.adoc
@@ -63,17 +63,6 @@ SpecificationProvider`].
|API is also a concrete class
-|xref:refguide:applib-svc:testing/SwitchUserService.adoc[`o.a.i.applib.` +
-`fixtures.switchuser` +
-`SwitchUserServiceService`]
-|(deprecated)
-|`SwitchUserServiceImpl` +
-``o.a.i.core`` +
-``isis-core-runtime``
-|
-
-
-
|===
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java b/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
index 7ce5709..19145bb 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/error/ErrorDetails.java
@@ -46,6 +46,6 @@ public class ErrorDetails {
* One per exception cause.
*/
@Getter
- private final List<List<String>> stackDetailListPerCause;
+ private final List<List<String>> stackTraceDetailPerCause;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index aee693f..a7616b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -201,7 +201,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
// this rule inspired by a similar rule for auditing and publishing, see DomainObjectAnnotationFacetFactory
//
if(HasUniqueId.class.isAssignableFrom(processMethodContext.getCls())) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
@@ -221,7 +221,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
// and for commands, see above
//
if(HasUniqueId.class.isAssignableFrom(processMethodContext.getCls())) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 1e9602c..9a2ad7b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -134,7 +134,7 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
// but think should apply in general
//
if(HasUniqueId.class.isAssignableFrom(cls)) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
@@ -157,7 +157,7 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
// this rule inspired by a similar rule for auditing, see above
//
if(HasUniqueId.class.isAssignableFrom(cls)) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 97fcef6..a1953f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -240,7 +240,7 @@ implements MetaModelRefiner {
// this rule inspired by a similar rule for auditing and publishing, see DomainObjectAnnotationFacetFactory
//
if(HasUniqueId.class.isAssignableFrom(processMethodContext.getCls())) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
@@ -273,7 +273,7 @@ implements MetaModelRefiner {
// and for commands, see above
//
if(HasUniqueId.class.isAssignableFrom(processMethodContext.getCls())) {
- // do not install on any implementation of HasTransactionId
+ // do not install on any implementation of HasUniqueId
// (ie commands, audit entries, published events).
return;
}
@@ -301,7 +301,7 @@ implements MetaModelRefiner {
val holder = processMethodContext.getFacetHolder();
// search for @Property(mustSatisfy=...)
- val facet = MustSatisfySpecificationFacetForPropertyAnnotation.create(propertyIfAny, holder, getServiceInjector());
+ val facet = MustSatisfySpecificationFacetForPropertyAnnotation.create(propertyIfAny, holder, getFactoryService());
super.addFacet(facet);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index 005e300..b819515 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -45,16 +45,13 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
@Qualifier("Default")
public class ServiceInjectorDefault implements ServiceInjector {
- @Inject private AutowireCapableBeanFactory autowireCapableBeanFactory;
-
-
-// @PostConstruct
-// public void init() {
-// if(autowireCapableBeanFactory==null) {
-// autowireCapableBeanFactory = _Spring.context().getAutowireCapableBeanFactory();
-// }
-// }
-
+ private final AutowireCapableBeanFactory autowireCapableBeanFactory;
+
+ @Inject
+ public ServiceInjectorDefault(AutowireCapableBeanFactory autowireCapableBeanFactory) {
+ this.autowireCapableBeanFactory = autowireCapableBeanFactory;
+ }
+
@Override
public <T> T injectServicesInto(T domainObject, Consumer<InjectionPoint> onNotResolvable) {
injectServices(domainObject, onNotResolvable);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 75f0026..f073f77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -67,11 +67,6 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
- private final IsisConfiguration configuration;
- private final ServiceRegistry serviceRegistry;
- private final SpecificationLoader specificationLoader;
- private final ApplicationFeatureFactory applicationFeatureFactory;
-
// -- caches
final SortedMap<ApplicationFeatureId, ApplicationFeature> packageFeatures = _Maps.newTreeMap();
private final SortedMap<ApplicationFeatureId, ApplicationFeature> classFeatures = _Maps.newTreeMap();
@@ -80,17 +75,26 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
private final SortedMap<ApplicationFeatureId, ApplicationFeature> collectionFeatures = _Maps.newTreeMap();
private final SortedMap<ApplicationFeatureId, ApplicationFeature> actionFeatures = _Maps.newTreeMap();
- // -- init
+ private final IsisConfiguration configuration;
+ private final ServiceRegistry serviceRegistry;
+ private final SpecificationLoader specificationLoader;
+ private final ApplicationFeatureFactory applicationFeatureFactory;
@Inject
- public ApplicationFeatureRepositoryDefault(IsisConfiguration configuration, ServiceRegistry serviceRegistry,
- SpecificationLoader specificationLoader, ApplicationFeatureFactory applicationFeatureFactory) {
+ public ApplicationFeatureRepositoryDefault(
+ IsisConfiguration configuration,
+ ServiceRegistry serviceRegistry,
+ SpecificationLoader specificationLoader,
+ ApplicationFeatureFactory applicationFeatureFactory) {
this.configuration = configuration;
this.serviceRegistry = serviceRegistry;
this.specificationLoader = specificationLoader;
this.applicationFeatureFactory = applicationFeatureFactory;
}
+ // -- init
+
+
@PostConstruct
public void init() {
if(isEagerInitialize()) {
@@ -559,8 +563,4 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
}
-
-
-
-
}
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index b4ea7c9..9515172 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -597,7 +598,7 @@ public interface ManagedObject {
val additionalArgCount = additionalArgValues.size();
val pendingArgsToConsiderCount = paramCount - additionalArgCount;
- val argIterator = pendingArgs!=null ? pendingArgs.iterator() : Collections.<ManagedObject>emptyIterator();
+ val argIterator = argIteratorFrom(pendingArgs);
val adjusted = new Object[paramCount];
for(int i=0; i<pendingArgsToConsiderCount; i++) {
@@ -618,7 +619,11 @@ public interface ManagedObject {
return adjusted;
}
-
+
+ private static Iterator<? extends ManagedObject> argIteratorFrom(List<? extends ManagedObject> pendingArgs) {
+ return pendingArgs!=null ? pendingArgs.iterator() : Collections.emptyIterator();
+ }
+
private static Object honorPrimitiveDefaults(
final Class<?> expectedType,
final @Nullable Object value) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
index 2f4d6e0..52a8a1c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
@@ -131,18 +131,6 @@ class ReflectTest {
}
- @Test
- void annotationLookup2() throws NoSuchMethodException, SecurityException {
-
- Class<?> type = JaxbServiceDefault.class;
- Method method = type.getMethod("fromXml", new Class[] {JAXBContext.class, String.class, Map.class});
-
- Programmatic annot = getAnnotation(method, Programmatic.class, true, true);
-
- assertNotNull(annot);
-
- }
-
// -- HELPER
private static void assertSetContainsAll(Set<String> shouldContain, Set<String> actuallyContains) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 3d21de0..4333f87 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -93,7 +93,7 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
}
}
- class SomeTransactionalId implements HasUniqueId {
+ class SomeHasUniqueId implements HasUniqueId {
public void someAction() {
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 44b54f6..f288ea6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -54,12 +54,12 @@ public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFa
}
@Test
- public void givenHasTransactionId_thenIgnored() {
+ public void given_HasUniqueId_thenIgnored() {
// given
- final Method actionMethod = findMethod(SomeTransactionalId.class, "someAction");
+ final Method actionMethod = findMethod(SomeHasUniqueId.class, "someAction");
// when
- processCommand(facetFactory, new ProcessMethodContext(SomeTransactionalId.class, null, actionMethod, mockMethodRemover, facetedMethod));
+ processCommand(facetFactory, new ProcessMethodContext(SomeHasUniqueId.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
final Facet facet = facetedMethod.getFacet(CommandFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index 67d6335..270d3fb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -48,11 +48,11 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
}
@Test
- public void givenHasTransactionId_thenIgnored() {
+ public void given_HasUniqueId_thenIgnored() {
- final Method actionMethod = findMethod(SomeTransactionalId.class, "someAction");
+ final Method actionMethod = findMethod(SomeHasUniqueId.class, "someAction");
- processPublishing(facetFactory, new ProcessMethodContext(SomeTransactionalId.class, null, actionMethod, mockMethodRemover, facetedMethod));
+ processPublishing(facetFactory, new ProcessMethodContext(SomeHasUniqueId.class, null, actionMethod, mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
assertNull(facet);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index fa1d127..3a9f4f4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -87,7 +87,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
- class SomeTransactionalId implements HasUniqueId {
+ class SomeHasUniqueId implements HasUniqueId {
@Override
public UUID getUniqueId() {
@@ -136,7 +136,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
@Test
- public void ignoreHasTransactionId() {
+ public void ignore_HasUniqueId() {
allowingAuditObjectsToReturn(AuditObjectsConfiguration.ALL);
@@ -261,7 +261,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
@Test
- public void ignoreHasTransactionId() {
+ public void ignore_HasUniqueId() {
allowingPublishObjectsToReturn(PublishObjectsConfiguration.ALL);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 07b2bc5..70552cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -43,6 +43,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
@@ -80,7 +81,6 @@ public class ApplicationFeatureRepositoryDefaultTest {
public void setUp() throws Exception {
final ApplicationFeatureFactory applicationFeatureFactory = new ApplicationFeatureFactory();
- //applicationFeatureFactory.factoryService = mockFactoryService;
applicationFeatureRepository = new ApplicationFeatureRepositoryDefault(
/*configuration*/ null,
diff --git a/security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc
index 4771a75..c5fa394 100644
--- a/security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc
+++ b/security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc
@@ -48,7 +48,6 @@ public class ShiroService {
}
----
<1> "jdbcRealm" is realm as configured in Shiro config (shiro.ini).
-Might want to look this up from `ConfigurationService`.
<2> The username of the currently logged in user (by which permissions are determined).
This could be the user name the real user is running as.
<3> The username of the real currently logged in user.