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
The following commit(s) were added to refs/heads/master by this push:
new 59383fad22 ISIS-3260: further renames of Isis -> Causeway in .adoc
files only.
59383fad22 is described below
commit 59383fad228162fe207fba88a41a305cf12c86c2
Author: Dan Haywood <[email protected]>
AuthorDate: Sun Oct 23 15:30:40 2022 +0100
ISIS-3260: further renames of Isis -> Causeway in .adoc files only.
---
.../hooks/Object_downloadLayoutXml_see-also.adoc | 2 +-
.../LayoutService_020-examples-and-usage.adoc | 2 +-
.../src/main/adoc/modules/commons/pages/about.adoc | 2 +-
.../flyway/adoc/modules/flyway/pages/about.adoc | 2 +-
.../quartz/adoc/modules/quartz/pages/about.adoc | 2 +-
.../secman/pages/setting-up-with-shiro.adoc | 14 +++---
.../pages/setting-up-with-spring-oauth2.adoc | 2 +-
.../adoc/modules/secman/pages/setting-up.adoc | 56 +++++++++++-----------
.../adoc/modules/shiro-realm-ldap/pages/about.adoc | 2 +-
.../modules/shiro-realm-ldap/pages/ldap-realm.adoc | 18 +++----
.../adoc/modules/spring-oauth2/pages/about.adoc | 12 ++---
.../vro/cors/adoc/modules/cors/pages/about.adoc | 2 +-
.../adoc/modules/exceldownload/pages/about.adoc | 2 +-
.../adoc/modules/fullcalendar/pages/about.adoc | 2 +-
.../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc | 2 +-
.../vw/sse/adoc/modules/sse/pages/about.adoc | 2 +-
.../kroviz/partials/design/arc-overview.adoc | 4 +-
.../kroviz/partials/design/uml-overview.adoc | 4 +-
mavendeps/adoc/modules/mavendeps/pages/about.adoc | 2 +-
.../jdo/adoc/modules/ROOT/pages/db-schemas.adoc | 2 +-
.../hints-and-tips/overriding-jdo-annotations.adoc | 6 +--
.../jdo/adoc/modules/ROOT/pages/mapping-guide.adoc | 4 +-
.../ROOT/pages/setup-and-configuration.adoc | 8 ++--
persistence/jdo/spring/README.adoc | 9 ++--
.../jpa/adoc/modules/ROOT/pages/db-schemas.adoc | 2 +-
.../jpa/adoc/modules/ROOT/pages/mapping-guide.adoc | 4 +-
.../ROOT/pages/setup-and-configuration.adoc | 4 +-
.../main/adoc/modules/keycloak/pages/about.adoc | 8 ++--
.../src/main/adoc/modules/shiro/pages/about.adoc | 10 ++--
.../src/main/adoc/modules/spring/pages/about.adoc | 8 ++--
.../adoc/modules/starters/pages/helloworld.adoc | 24 +++++-----
.../adoc/modules/starters/pages/simpleapp.adoc | 48 +++++++++----------
.../adoc/modules/archtestsupport/pages/about.adoc | 2 +-
.../adoc/modules/fakedata/pages/about.adoc | 6 +--
.../adoc/modules/integtestsupport/pages/about.adoc | 42 ++++++++--------
.../pages/influencing-the-interaction.adoc | 4 +-
.../integtestsupport/pages/swagger-exporter.adoc | 2 +-
.../adoc/modules/specsupport/pages/about.adoc | 4 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 4 +-
.../ROOT/pages/setup-and-configuration.adoc | 2 +-
.../ROOT/pages/hints-and-tips/per-user-themes.adoc | 11 +++--
.../ROOT/pages/setup-and-configuration.adoc | 4 +-
42 files changed, 175 insertions(+), 177 deletions(-)
diff --git
a/antora/components/refguide-index/modules/applib/pages/index/mixins/layout/hooks/Object_downloadLayoutXml_see-also.adoc
b/antora/components/refguide-index/modules/applib/pages/index/mixins/layout/hooks/Object_downloadLayoutXml_see-also.adoc
index 3c065cdb0e..59909fe3c7 100644
---
a/antora/components/refguide-index/modules/applib/pages/index/mixins/layout/hooks/Object_downloadLayoutXml_see-also.adoc
+++
b/antora/components/refguide-index/modules/applib/pages/index/mixins/layout/hooks/Object_downloadLayoutXml_see-also.adoc
@@ -9,5 +9,5 @@
* xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService]
-* xref:refguide:applib:index/services/layout/Style.adoc[Style] (enum)
+*
xref:refguide:applib:index/services/layout/LayoutExportStyle.adoc[LayoutExportStyle]
(enum)
diff --git
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
index 62a85bbc40..60cc0c980d 100644
---
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
+++
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
@@ -15,7 +15,7 @@ The XML can then be copied into the codebase of the
application, and annotations
=== Styles
-Each of these actions take as a parameter an instance of
xref:refguide:applib:index/services/layout/Style.adoc[Style].
+Each of these actions take as a parameter an instance of
xref:refguide:applib:index/services/layout/LayoutExportStyle.adoc[LayoutExportStyle].
The `CURRENT` style corresponds to the layout already loaded for the domain
class, typically from an already persisted `layout.xml` file.
The other three styles allow the developer to choose how much metadata is to
be specified in the XML, and how much (if any) will be obtained elsewhere,
typically from annotations in the metamodel.
diff --git a/commons/src/main/adoc/modules/commons/pages/about.adoc
b/commons/src/main/adoc/modules/commons/pages/about.adoc
index e739cb0f8c..13617f2ba0 100644
--- a/commons/src/main/adoc/modules/commons/pages/about.adoc
+++ b/commons/src/main/adoc/modules/commons/pages/about.adoc
@@ -13,7 +13,7 @@ _Apache Causeway_ developers to run into _jar_ version
conflicts, when using one
3^rd^ party libraries.
It now also allows us to collect utilities in support of common idioms, that
we use
-throughout the _Apache Isis_ ecosystem.
+throughout the _Apache Causeway_ ecosystem.
== Packages
diff --git a/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
b/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
index 755b61555b..3f366863df 100644
--- a/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
+++ b/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
@@ -23,7 +23,7 @@ Also add the following module to your `AppManifest`:
@Configuration
@Import({
...
- IsisModuleExtFlywayImpl.class,
+ CausewayModuleExtFlywayImpl.class,
...
})
public static class AppManifest {
diff --git a/extensions/core/quartz/adoc/modules/quartz/pages/about.adoc
b/extensions/core/quartz/adoc/modules/quartz/pages/about.adoc
index d5e6260f8c..cde63a13a1 100644
--- a/extensions/core/quartz/adoc/modules/quartz/pages/about.adoc
+++ b/extensions/core/quartz/adoc/modules/quartz/pages/about.adoc
@@ -125,7 +125,7 @@ If either are used:
@Configuration
@Import({
// ...
- IsisModuleExtQuartzImpl.class,
+ CausewayModuleExtQuartzImpl.class,
})
// ...
public class AppManifest {
diff --git
a/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-shiro.adoc
b/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-shiro.adoc
index 9ccc92966b..b5fb23d143 100644
---
a/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-shiro.adoc
+++
b/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-shiro.adoc
@@ -19,7 +19,7 @@ Thus:
* Apache Causeway' xref:security:shiro:about.adoc[Shiro security] integration
sets up Shiro web filters to intercept every http request, as well as the
xref:refguide:security:index/shiro/authentication/AuthenticatorShiro.adoc[AuthenticatorShiro]
implementation.
* The `AuthenticatorShiro` calls to the Shiro Security Manager to obtain the
authenticated principal.
-* The Shiro Security Manager uses the `shiro.ini` configuration file to look
up the realm to perform the authentication; in this case we configure it to use
Secman's realm
(xref:refguide:extensions:index/secman/delegated/shiro/realm/IsisModuleExtSecmanShiroRealm.adoc[IsisModuleExtSecmanShiroRealm]).
+* The Shiro Security Manager uses the `shiro.ini` configuration file to look
up the realm to perform the authentication; in this case we configure it to use
Secman's realm
(xref:refguide:extensions:index/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.adoc[CausewayModuleExtSecmanShiroRealm]).
* Secman's realm implementation queries the database and uses this to create
an instance of `PrincipalForApplicationUser`, where the `Principal` interface
is Shiro's representation of an authenticated user.
The `PrincipalForApplicationUser` is backed by
xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser],
which all of the permissions to object members for this particular user.
* to render a page, the Apache Causeway viewer uses configured `Authorizor`,
in this case
@@ -35,7 +35,7 @@ These are called "local" users, as per the
xref:refguide:extensions:index/secman
Local authentication - as described in the previous section - does not
actually accomplish much; although Shiro's `Authenticator` implementation is in
use, since the Shiro Realm just queries the SecMan database, there is no real
difference from simply using SecMan's own `Authenticator` implementation.
-Where things become more interesting and useful is that Secman's
xref:refguide:extensions:index/secman/delegated/shiro/realm/IsisModuleExtSecmanShiroRealm.adoc[Realm
implementation] also allows an alternative "delegate" realm (eg LDAP) to be
queried.
+Where things become more interesting and useful is that Secman's
xref:refguide:extensions:index/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.adoc[Realm
implementation] also allows an alternative "delegate" realm (eg LDAP) to be
queried.
In such cases Shiro can obtain authentication of "delegated" users is
performed by the delegate realm rather than locally.
The diagram below shows where this delegation occurs:
@@ -88,7 +88,7 @@ You will also need to import the fixture module; SecMan uses
fixture scripts to
@Configuration
@Import({
...
- IsisModuleExtSecmanRealmShiro.class, // <.>
+ CausewayModuleExtSecmanRealmShiro.class, // <.>
...
})
public class AppManifest {
@@ -97,9 +97,9 @@ public class AppManifest {
<.> enables Shiro integration (so that Shiro delegates to Secman for
authentication).
+
-This brings in a transitive dependency on the `IsisModuleSecurityShiro` module.
+This brings in a transitive dependency on the `CausewayModuleSecurityShiro`
module.
-Ensure that no other `IsisModuleSecurityXxx` module is imported into the
AppManifest.
+Ensure that no other `CausewayModuleSecurityXxx` module is imported into the
AppManifest.
@@ -116,7 +116,7 @@ The following sets up Shiro _without_ delegation:
[main]
authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
-causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
+causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
securityManager.realms = $causewayModuleSecurityRealm
@@ -140,7 +140,7 @@ For example, to use xref:shiro-realm-ldap:about.adoc[LDAP
Realm for Shiro] as a
[main]
...
-ldapRealm=org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapRealm
#<.>
+ldapRealm=org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapRealm
#<.>
ldapRealm.xxx=...
#<.>
ldapRealm.yyy=...
diff --git
a/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-spring-oauth2.adoc
b/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-spring-oauth2.adoc
index f461a828c6..927192dee5 100644
---
a/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-spring-oauth2.adoc
+++
b/extensions/security/secman/adoc/modules/secman/pages/setting-up-with-spring-oauth2.adoc
@@ -33,7 +33,7 @@ And update your `AppManifest`:
@Configuration
@Import({
...
- IsisModuleExtSecmanDelegatedSpringOauth2.class,
+ CausewayModuleExtSecmanDelegatedSpringOauth2.class,
...
})
public class AppManifest {
diff --git
a/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
b/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
index e0c418eb82..d55c5c419f 100644
--- a/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
+++ b/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
@@ -67,21 +67,21 @@ You will also need to import the fixture module; SecMan
uses fixture scripts to
@Configuration
@Import({
...
- IsisModuleExtSecmanPersistenceXxx.class, // <.>
- IsisModuleExtSecmanEncryptionJbcrypt.class, // <.>
+ CausewayModuleExtSecmanPersistenceXxx.class, // <.>
+ CausewayModuleExtSecmanEncryptionJbcrypt.class, // <.>
- IsisModuleTestingFixturesApplib.class, // <.>
+ CausewayModuleTestingFixturesApplib.class, // <.>
...
})
public class AppManifest {
}
----
-<.> specify either `IsisModuleExtSecmanPersistenceJdo` or
`IsisModuleExtSecmanPersistenceJpa`, as required
+<.> specify either `CausewayModuleExtSecmanPersistenceJdo` or
`CausewayModuleExtSecmanPersistenceJpa`, as required
<.> use Jbcrypt to encrypt passwords
<.> fixture script support
-In addition, you will probably want to *remove* the
`IsisModuleSecurityShiro.class` dependency so that SecMan can take care of both
authentication _and_ authorisation.
+In addition, you will probably want to *remove* the
`CausewayModuleSecurityShiro.class` dependency so that SecMan can take care of
both authentication _and_ authorisation.
[NOTE]
====
@@ -223,43 +223,43 @@ This role should therefore be extremely tightly locked
down.
Regular user permissions for Secman.
This should be granted to all users (in particular, it includes the ability to
logout!)
-** `IsisConfigurationRoleAndPermissions.ROLE_NAME`
+** `CausewayConfigurationRoleAndPermissions.ROLE_NAME`
+
Access the configuration properties (from the tertiary menu))
* Available only in prototype mode:
-** `IsisAppFeatureRoleAndPermissions.ROLE_NAME`
+** `CausewayAppFeatureRoleAndPermissions.ROLE_NAME`
+
Browse the application features + permissions (from the "Prototyping" menu).
-** `IsisPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME`
+** `CausewayPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME`
+
Download the JDO metamodel (from the "Prototyping" menu).
// moved to the incubator for the time being
-//** `IsisExtCommandReplayPrimaryRoleAndPermissions.ROLE_NAME`
+//** `CausewayExtCommandReplayPrimaryRoleAndPermissions.ROLE_NAME`
//+
//Access to the command replay primary menu
//
-//** `IsisExtCommandReplaySecondaryRoleAndPermissions.ROLE_NAME`
+//** `CausewayExtCommandReplaySecondaryRoleAndPermissions.ROLE_NAME`
//+
//Access to the command replay secondary menu
//
-** `IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME`
+** `CausewayExtH2ConsoleRoleAndPermissions.ROLE_NAME`
+
Access the h2 console (from the "Prototyping" menu)
-** `IsisViewerRestfulObjectsSwaggerRoleAndPermissions.ROLE_NAME`
+** `CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.ROLE_NAME`
+
Access the swagger UI (from the "Prototyping" menu)
-** `IsisSudoImpersonateRoleAndPermissions.ROLE_NAME`
+** `CausewaySudoImpersonateRoleAndPermissions.ROLE_NAME`
+
Impersonate other users (from the "Prototyping" menu, and mixins)
-The full list can be found by searching for subclasses of
xref:refguide:extensions:index/secman/applib/role/fixtures/
AbstractRoleAndPermissionsFixtureScript.adoc[AbstractRoleAndPermissionsFixtureScript].
+The full list can be found by searching for subclasses of
xref:refguide:extensions:index/secman/applib/role/fixtures/AbstractRoleAndPermissionsFixtureScript.adoc[AbstractRoleAndPermissionsFixtureScript].
[NOTE]
====
@@ -308,7 +308,7 @@ public class SeedSecurityService {
private final FixtureScripts fixtureScripts;
private final TransactionService transactionService;
- private final IsisSystemEnvironment causewaySystemEnvironment;
+ private final CausewaySystemEnvironment causewaySystemEnvironment;
@EventListener(MetamodelEvent.class)
public void onMetamodelEvent(final MetamodelEvent event) {
@@ -367,16 +367,16 @@ public class UserToRole__bob_allRoles extends
AbstractUserAndRolesFixtureScript
"/", // <.>
AccountType.LOCAL, // <.>
Can.of(
- RoleAndPerms__UserRw.ROLE_NAME
// <.>
- ,
IsisConfiguration.Extensions.Secman.Seed.REGULAR_USER_ROLE_NAME_DEFAULT // <.>
- , IsisAppFeatureRoleAndPermissions.ROLE_NAME // <.>
- , IsisPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME // <7>
- , IsisExtCommandReplayPrimaryRoleAndPermissions.ROLE_NAME // <7>
- , IsisExtCommandReplaySecondaryRoleAndPermissions.ROLE_NAME // <7>
- , IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME // <7>
- , IsisViewerRestfulObjectsSwaggerRoleAndPermissions.ROLE_NAME // <7>
- , IsisSudoImpersonateRoleAndPermissions.ROLE_NAME // <7>
- , IsisConfigurationRoleAndPermissions.ROLE_NAME // <7>
+ RoleAndPerms__UserRw.ROLE_NAME
// <.>
+ ,
CausewayConfiguration.Extensions.Secman.Seed.REGULAR_USER_ROLE_NAME_DEFAULT //
<.>
+ , CausewayAppFeatureRoleAndPermissions.ROLE_NAME
// <.>
+ , CausewayPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewayExtCommandReplayPrimaryRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewayExtCommandReplaySecondaryRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewayExtH2ConsoleRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewaySudoImpersonateRoleAndPermissions.ROLE_NAME
// <7>
+ , CausewayConfigurationRoleAndPermissions.ROLE_NAME
// <7>
));
}
}
@@ -434,9 +434,9 @@ public class UserToRole__joe_UserRw_but_NoDelete
"/ITA",
AccountType.LOCAL,
Can.of(
- RoleAndPerms__UserRw.ROLE_NAME
// <.>
- ,RoleAndPerms__NoDelete.ROLE_NAME
// <1>
-
,IsisConfiguration.Extensions.Secman.Seed.REGULAR_USER_ROLE_NAME_DEFAULT // <.>
+ RoleAndPerms__UserRw.ROLE_NAME
// <.>
+ ,RoleAndPerms__NoDelete.ROLE_NAME
// <1>
+
,CausewayConfiguration.Extensions.Secman.Seed.REGULAR_USER_ROLE_NAME_DEFAULT //
<.>
));
}
}
diff --git
a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
index 4967fa5450..b30cfc50fd 100644
---
a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
+++
b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
@@ -16,7 +16,7 @@
The Shiro framework also ships with an implementation of an LDAP-based realm;
LDAP is often used to manage user/passwords and corresponding user groups.
-Apache Causeway extends Shiro's implementation this `IsisLdapRealm`, which
provides more flexibility for both group/role and role/permissions management.
+Apache Causeway extends Shiro's implementation this `CausewayLdapRealm`,
which provides more flexibility for both group/role and role/permissions
management.
WARNING: TODO: v2 - to write up...
diff --git
a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/ldap-realm.adoc
b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/ldap-realm.adoc
index 2b2fa94c8e..adf96105eb 100644
---
a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/ldap-realm.adoc
+++
b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/ldap-realm.adoc
@@ -16,30 +16,30 @@ To use LDAP involves telling Shiro how to instantiate the
realm. This bootstrap
[source,ini]
----
-contextFactory = org.apache.causeway.security.shiro.IsisLdapContextFactory
+contextFactory = org.apache.causeway.security.shiro.CausewayLdapContextFactory
contextFactory.url = ldap://localhost:10389
-contextFactory.systemUsername = uid=admin,ou=system # <.>
+contextFactory.systemUsername = uid=admin,ou=system # <.>
contextFactory.systemPassword = secret
-contextFactory.authenticationMechanism = CRAM-MD5 # <.>
+contextFactory.authenticationMechanism = CRAM-MD5 # <.>
contextFactory.systemAuthenticationMechanism = simple
-ldapRealm = org.apache.causeway.security.shiro.IsisLdapRealm # <.>
+ldapRealm = org.apache.causeway.security.shiro.CausewayLdapRealm # <.>
ldapRealm.contextFactory = $contextFactory
-ldapRealm.searchBase = ou=groups,o=mojo # <.>
-ldapRealm.groupObjectClass = groupOfUniqueNames # <.>
-ldapRealm.uniqueMemberAttribute = uniqueMember # <.>
+ldapRealm.searchBase = ou=groups,o=mojo # <.>
+ldapRealm.groupObjectClass = groupOfUniqueNames # <.>
+ldapRealm.uniqueMemberAttribute = uniqueMember # <.>
ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
# optional mapping from physical groups to logical application roles
-ldapRealm.rolesByGroup = \ # <.>
+ldapRealm.rolesByGroup = \ # <.>
LDN_USERS: user_role,\
NYK_USERS: user_role,\
HKG_USERS: user_role,\
GLOBAL_ADMIN: admin_role,\
DEMOS: self-install_role
-ldapRealm.permissionsByRole=\ # <.>
+ldapRealm.permissionsByRole=\ # <.>
user_role = *:ToDoItemsJdo:*:*,\
*:ToDoItem:*:*; \
self-install_role = *:ToDoItemsFixturesService:install:* ; \
diff --git
a/extensions/security/spring-oauth2/src/main/adoc/modules/spring-oauth2/pages/about.adoc
b/extensions/security/spring-oauth2/src/main/adoc/modules/spring-oauth2/pages/about.adoc
index b24b6fae45..9d58f0842e 100644
---
a/extensions/security/spring-oauth2/src/main/adoc/modules/spring-oauth2/pages/about.adoc
+++
b/extensions/security/spring-oauth2/src/main/adoc/modules/spring-oauth2/pages/about.adoc
@@ -28,7 +28,7 @@ In the webapp module of your application, add the following
dependency:
[[_update-appmanifest]]
== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import `IsisModuleSecuritySpring` and
`IsisModuleExtSpringSecurityOAuth2` modules.
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import `CausewayModuleSecuritySpring` and
`CausewayModuleExtSpringSecurityOAuth2` modules.
Neither of these modules provide an implementation of the
xref:refguide:core:index/security/authorization/Authorizor.adoc[] SPI, so we
must also configure one.
For the purpose of this walkthrough, we'll use the implementation provided by
xref:security:shiro:about.adoc[Shiro], namely `AuthorizorShiro`.
@@ -39,16 +39,16 @@ For the purpose of this walkthrough, we'll use the
implementation provided by xr
@Configuration
@Import({
...
- IsisModuleExtSpringSecurityOAuth2.class, // <.>
+ CausewayModuleExtSpringSecurityOAuth2.class, // <.>
AuthorizorShiro.class,
...
})
public class AppManifest {
}
----
-<.> The `IsisModuleExtSpringSecurityOAuth2` module brings in a transitive
dependency on `IsisModuleSecuritySpring`.
+<.> The `CausewayModuleExtSpringSecurityOAuth2` module brings in a transitive
dependency on `CausewayModuleSecuritySpring`.
+
-Make sure though that no other `IsisModuleSecurityXxx` module is imported.
+Make sure though that no other `CausewayModuleSecurityXxx` module is imported.
It is also possible to use with other `Authorizor` implementations; for
example, using xref:security:secman:setting-up-with-spring-oauth2.adoc[SecMan].
@@ -119,7 +119,7 @@ public class AppManifest {
@Configuration
@Import({
...
- IsisModuleExtSpringSecurityOAuth2.class,
+ CausewayModuleExtSpringSecurityOAuth2.class,
AuthorizorShiro.class,
LoginController.class,
...
@@ -137,7 +137,7 @@ Next configure authenticationStrategy and permissenResolver
for realms, and add
authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
securityManager.realms = $iniRealm
-permissionResolver =
org.apache.causeway.security.shiro.authorization.IsisPermissionResolver
+permissionResolver =
org.apache.causeway.security.shiro.authorization.CausewayPermissionResolver
iniRealm.permissionResolver = $permissionResolver
...
[users]
diff --git a/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
b/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
index f51920e6f9..5a198a91e0 100644
--- a/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
+++ b/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
@@ -28,7 +28,7 @@ Also add the following module to your `AppManifest`:
----
@Configuration
@Import({
- IsisModuleExtCors.class,
+ CausewayModuleExtCors.class,
...
})
public class AppManifest {
diff --git
a/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
b/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
index 081d442ce1..eca49ecca2 100644
--- a/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
+++ b/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
@@ -25,7 +25,7 @@ Also add the following module to your `AppManifest`:
----
@Configuration
@Import({
- IsisModuleExtExcelDownloadWicketUi.class,
+ CausewayModuleExtExcelDownloadWicketUi.class,
...
})
public class AppManifest {
diff --git
a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
index 343ec2ab0f..5666e1ec3a 100644
--- a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
+++ b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
@@ -36,7 +36,7 @@ To configure the extension:
----
@Configuration
@Import({
- IsisModuleExtFullCalendarWicketUi.class, // <.>
+ CausewayModuleExtFullCalendarWicketUi.class, // <.>
...
})
public class AppManifest {
diff --git a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
index 145ba755f7..a774e1c6bd 100644
--- a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
+++ b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
@@ -61,7 +61,7 @@ This will provide access to the
xref:refguide:extensions:index/pdfjs/applib/anno
----
@Configuration
@Import({
- IsisModuleExtPdfjsWicketUi.class, // <.>
+ CausewayModuleExtPdfjsWicketUi.class, // <.>
...
})
public class AppManifest {
diff --git a/extensions/vw/sse/adoc/modules/sse/pages/about.adoc
b/extensions/vw/sse/adoc/modules/sse/pages/about.adoc
index 105415dca9..f76b8f4030 100644
--- a/extensions/vw/sse/adoc/modules/sse/pages/about.adoc
+++ b/extensions/vw/sse/adoc/modules/sse/pages/about.adoc
@@ -35,7 +35,7 @@ Also add the following module to your `AppManifest`:
----
@Configuration
@Import({
- IsisModuleExtSseWicket.class, // <.>
+ CausewayModuleExtSseWicket.class, // <.>
...
})
public class AppManifest {
diff --git
a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
index 8809d0b5f3..9dfa5d1812 100644
---
a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
+++
b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
@@ -27,10 +27,10 @@ component V8 <<"<JS Runtime>">> {
node server{
interface RestfulObjects as RO
- component ApacheIsis<<NakedObjects>> [[https://causeway.apache.org/]]
#F79646
+ component ApacheCauseway<<NakedObjects>> [[https://causeway.apache.org/]]
#F79646
}
-ApacheIsis -- RO
+ApacheCauseway -- RO
kroViz --> RO : invoke\ \nuse
@enduml
----
diff --git
a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
index bacf5c6bb8..2b7251097a 100644
---
a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
+++
b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
@@ -74,9 +74,9 @@ ResponseHandler .> TransferObject : converts \n JSON \n into
TO
circle RestfulObjects<<RemoteFacade>>
package remote <<Node>> {
- class ApacheIsis<<(F, #FF7700)FrameWork>>
+ class ApacheCauseway<<(F, #FF7700)FrameWork>>
class NakedObjects<<(F, #FF7700)FrameWork>>
- RestfulObjects <|- ApacheIsis
+ RestfulObjects <|- ApacheCauseway
RestfulObjects <|-- NakedObjects
}
XHR -( RestfulObjects : invoke() \njson string / blob <
diff --git a/mavendeps/adoc/modules/mavendeps/pages/about.adoc
b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
index 64a21f3798..f424473340 100644
--- a/mavendeps/adoc/modules/mavendeps/pages/about.adoc
+++ b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
@@ -36,7 +36,7 @@ If you don't need any of these, then use a Maven
`<exclusion>`.
In addition, you will probably need to specify a persistence implementation
(xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] or
xref:pjdo:ROOT:about.adoc[JDO/DataNucleus]) as well as a security
implementation.
Also, remember that adding the class onto the classpath does _not_ make that
functionality available (Apache Causeway does not currently leverage Spring
Boot's
link:https://docs.spring.io/spring-boot/docs/current/reference/html/using-spring-boot.html#using-boot-auto-configuration[auto
configuration] capabilities).
-You must therefore also add in the appropriate `IsisModuleXxx` to your
application's top-level
link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Configuration.html[@Configuration]
(aka "app manifest").
+You must therefore also add in the appropriate `CausewayModuleXxx` to your
application's top-level
link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Configuration.html[@Configuration]
(aka "app manifest").
For example, see the xref:docs:starters:simpleapp.adoc#appmanifest[AppManifest
for the SimpleApp] starter app.
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
index e03873630d..1750d5bf9e 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -9,7 +9,7 @@ In the same way that Java packages act as a namespace for
domain objects, it's g
We recommend all the entities within a module use the same schema, and
moreover that the
xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[object
type] also follows the same pattern.
-For example, xref:security:secman:about.adoc[SecMan]' JDO implementation
resides in the `IsisModuleExtSecmanPersistenceJpa` module.
+For example, xref:security:secman:about.adoc[SecMan]' JDO implementation
resides in the `CausewayModuleExtSecmanPersistenceJpa` module.
Its `ApplicationUser` entity is defined as:
[source,java]
diff --git
a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
b/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
index 8dd5d3e069..468e6bc644 100644
---
a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
+++
b/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
@@ -3,7 +3,7 @@
: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: to update.
JDO/DataNucleus builds its own persistence metamodel by reading both
annotations on the class and also by searching for metadata in XML files.
The metadata in the XML files takes precedence over the annotations, and so
can be used to override metadata that is "hard-coded" in annotations.
@@ -34,14 +34,14 @@ For example, the `AuditEntry` entity in the
xref:security:audittrail:about.adoc[
----
@javax.jdo.annotations.PersistenceCapable(
identityType=IdentityType.DATASTORE,
- schema = "IsisAddonsAudit",
+ schema = "causewayAddonsAudit",
table="AuditEntry")
public class AuditEntry {
...
}
----
-This will map the `AuditEntry` class to a table
`"IsisAddonsAudit"."AuditEntry"`; that is using a custom
schema to own the object.
+This will map the `AuditEntry` class to a table
`"CausewayAddonsAudit"."AuditEntry"`; that is using a
custom schema to own the object.
Suppose though that for whatever reason we didn't want to use a custom schema
but would rather use the default.
Also suppose we are using SQL Server as our target database.
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
b/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
index 32bfdfda0a..ed6f2bc6af 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
@@ -63,7 +63,7 @@ public class MyEntity ... {
@Configuration
@Import({
...
- IsisModuleValAsciidocPersistenceJdo.java
+ CausewayModuleValAsciidocPersistenceJdo.java
...
})
public class AppManifest {
@@ -110,7 +110,7 @@ public class MyEntity ... {
@Configuration
@Import({
...
- IsisModuleValMarkdownPersistenceJdo.java
+ CausewayModuleValMarkdownPersistenceJdo.java
...
})
public class AppManifest {
diff --git
a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index 4ae668aa5f..9a81b97e72 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -17,7 +17,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModulePersistenceJdoDatanucleus.class,
+ CausewayModulePersistenceJdoDatanucleus.class,
...
})
public class AppManifest {
@@ -109,10 +109,10 @@ If running in an integration test, you can use a preset:
----
@SpringBootTest
@TestPropertySource({
- IsisPresets.UseLog4j2Test,
- IsisPresets.DatanucleusEagerlyCreateTables // <.>
+ CausewayPresets.UseLog4j2Test,
+ CausewayPresets.DatanucleusEagerlyCreateTables // <.>
})
-class MyIntegrationTest extends IsisIntegrationTestAbstract {
+class MyIntegrationTest extends CausewayIntegrationTestAbstract {
//...
}
----
diff --git a/persistence/jdo/spring/README.adoc
b/persistence/jdo/spring/README.adoc
index 635ee81c2b..9dd412dcbf 100644
--- a/persistence/jdo/spring/README.adoc
+++ b/persistence/jdo/spring/README.adoc
@@ -8,13 +8,10 @@
footnote:[https://github.com/spring-projects/spring-framework/issues/18702[Sprin
Credits to the original authors!
-The following is an adoption of the original
-footnote:[https://docs.spring.io/spring-framework/docs/3.0.0.RC2/reference/html/ch13s04.html[docs.spring.io]]
-documentation.
+The following is an adoption of the
originalfootnote:[https://docs.spring.io/spring-framework/docs/3.0.0.RC2/reference/html/ch13s04.html[docs.spring.io]]documentation.
-WARNING: With the XML examples, former package names
`org.springframework.orm.jdo` have not been corrected to their forked
-correspondents in `org.apache.causeway.persistence.jdo.spring`. Likewise with
the descriptive text, some references pointing
-to _Spring_ have not been corrected to point to _Apache Isis_.
+WARNING: With the XML examples, former package names
`org.springframework.orm.jdo` have not been corrected to their forked
correspondents in `org.apache.causeway.persistence.jdo.spring`.
+Likewise with the descriptive text, some references pointing to _Spring_ have
not been corrected to point to _Apache Causeway_.
== JDO
diff --git a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
index e7c84779e1..7c1330d236 100644
--- a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -9,7 +9,7 @@ In the same way that Java packages act as a namespace for
domain objects, it's g
We recommend all the entities within a module use the same schema, and
moreover that the
xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical
type name] also follows the same pattern.
-For example, xref:security:secman:about.adoc[SecMan]' JPA implementation
resides in the `IsisModuleExtSecmanPersistenceJpa` module.
+For example, xref:security:secman:about.adoc[SecMan]' JPA implementation
resides in the `CausewayModuleExtSecmanPersistenceJpa` module.
Its `ApplicationUser` entity is defined as:
[source,java]
diff --git a/persistence/jpa/adoc/modules/ROOT/pages/mapping-guide.adoc
b/persistence/jpa/adoc/modules/ROOT/pages/mapping-guide.adoc
index 3a7af87daf..d399210714 100644
--- a/persistence/jpa/adoc/modules/ROOT/pages/mapping-guide.adoc
+++ b/persistence/jpa/adoc/modules/ROOT/pages/mapping-guide.adoc
@@ -67,7 +67,7 @@ public class MyEntity ... {
@Configuration
@Import({
...
- IsisModuleValAsciidocPersistenceJpa.java
+ CausewayModuleValAsciidocPersistenceJpa.java
...
})
public class AppManifest {
@@ -114,7 +114,7 @@ public class MyEntity ... {
@Configuration
@Import({
...
- IsisModuleValMarkdownPersistenceJpa.java
+ CausewayModuleValMarkdownPersistenceJpa.java
...
})
public class AppManifest {
diff --git
a/persistence/jpa/adoc/modules/ROOT/pages/setup-and-configuration.adoc
b/persistence/jpa/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index d01827c91f..e774785ffe 100644
--- a/persistence/jpa/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ b/persistence/jpa/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -20,7 +20,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleJpaEclipselink.class,
+ CausewayModuleJpaEclipselink.class,
...
})
public class AppManifest {
@@ -79,7 +79,7 @@ is set to an Apache Causeway implementation, to assist with
dependency injection
Generally these should not be changed, though if there is a requirement, then
provide a subclasse alternate implementation of
`org.apache.causeway.persistence.jpa.eclipselink.config.ElSettings` with an
earlier `@Priority` precedence.
-To set other EclipseLink configuration properties, use a subclass of
xref:refguide:persistence:index/jpa/eclipselink/IsisModulePersistenceJpaEclipselink.adoc[]
and override `getVendorProperties()`.
+To set other EclipseLink configuration properties, use a subclass of
xref:refguide:persistence:index/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.adoc[]
and override `getVendorProperties()`.
== Other Configuration Properties
diff --git a/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
b/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
index 43b8c598a2..35c937a6ad 100644
--- a/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
+++ b/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
@@ -29,7 +29,7 @@ In the webapp module of your application, add the following
dependency:
== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `IsisModuleSecurityKeycloak` module and remove
any other `IsisModuleSecurityXxx` modules.
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `CausewayModuleSecurityKeycloak` module and
remove any other `CausewayModuleSecurityXxx` modules.
[source,java]
.AppManifest.java
@@ -37,7 +37,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleSecurityKeycloak.class,
+ CausewayModuleSecurityKeycloak.class,
...
})
public class AppManifest {
@@ -53,14 +53,14 @@ Also, as this module provides no implementation of the
xref:refguide:core:index/
@Configuration
@Import({
...
- IsisModuleSecurityKeycloak.class, // <.>
+ CausewayModuleSecurityKeycloak.class, // <.>
AuthorizorBypass.class, // <.>
...
})
public class AppManifest {
}
----
-<.> make sure that no other `IsisModuleSecurityXxx` module is imported.
+<.> make sure that no other `CausewayModuleSecurityXxx` module is imported.
<.> or some other implementation of `Authorizor`.
diff --git a/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
b/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
index 28c83fbdfd..dd5ca982d0 100644
--- a/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
+++ b/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
@@ -56,14 +56,14 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleSecurityShiro.class,
+ CausewayModuleSecurityShiro.class,
...
})
public class AppManifest {
}
----
-Make sure that no other `IsisModuleSecurityXxx` module is imported.
+Make sure that no other `CausewayModuleSecurityXxx` module is imported.
=== Configuration Properties
@@ -281,13 +281,13 @@ Instead, the corresponding sections from for `realm1.ini`
are used instead.
== Enhanced Wildcard Permission
If using the text-based
xref:security:shiro:about.adoc#shiro-ini-realm[IniRealm] or
xref:security:shiro-realm-ldap:about.adoc[Apache Causeway' LDAP realm], then
note that Shiro also allows the string representation of the permissions to be
mapped (resolved) to alternative `Permission` instances.
-Apache Causeway provides its own `IsisPermission` which introduces the concept
of a "veto".
+Apache Causeway provides its own `CausewayPermission` which introduces the
concept of a "veto".
A vetoing permission is one that prevents access to a feature, rather than
grants it.
This is useful in some situations where most users have access to most
features, and only a small number of features are particularly sensitive.
The configuration can therefore be set up to grant fairly broad-brush
permissions and then veto permission for the sensitive features for those users
that do not have access.
-The string representation of the `IsisPermission` uses the following format:
+The string representation of the `CausewayPermission` uses the following
format:
[source,ini]
----
@@ -336,7 +336,7 @@ To configure Apache Causeway' extended permission support
requires that a custom
[source,ini]
----
-permissionResolver =
org.apache.causeway.security.shiro.authorization.IsisPermissionResolver
+permissionResolver =
org.apache.causeway.security.shiro.authorization.CausewayPermissionResolver
myRealm.permissionResolver = $permissionResolver # <.>
----
<.> `myRealm` is the handle to the configured realm, eg `$iniRealm` or
`$causewayLdapRealm` etc.
diff --git a/security/spring/src/main/adoc/modules/spring/pages/about.adoc
b/security/spring/src/main/adoc/modules/spring/pages/about.adoc
index a102bbadb7..ac3b402d3a 100644
--- a/security/spring/src/main/adoc/modules/spring/pages/about.adoc
+++ b/security/spring/src/main/adoc/modules/spring/pages/about.adoc
@@ -31,7 +31,7 @@ In the webapp module of your application, add the following
dependency:
[[_update-appmanifest]]
== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `IsisModuleSecuritySpring` module and remove any
other `IsisModuleSecurityXxx` modules.
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `CausewayModuleSecuritySpring` module and remove
any other `CausewayModuleSecurityXxx` modules.
Also, as this module provides no implementation of the
xref:refguide:core:index/security/authorization/Authorizor.adoc[Authorizor]
SPI, instead you will need some an alternative implementation, such as the
xref:bypass:about.adoc[Bypass] implementation.
(Note: this will in effect disable authorisation checks).
@@ -42,14 +42,14 @@ Also, as this module provides no implementation of the
xref:refguide:core:index/
@Configuration
@Import({
...
- IsisModuleSecuritySpring.class, // <.>
+ CausewayModuleSecuritySpring.class, // <.>
AuthorizorBypass.class, // <.>
...
})
public class AppManifest {
}
----
-<.> make sure that no other `IsisModuleSecurityXxx` module is imported.
+<.> make sure that no other `CausewayModuleSecurityXxx` module is imported.
<.> or some other implementation of `Authorizor`.
@@ -134,7 +134,7 @@ As discussed <<_update-appmanifest,above>>, we need to
reference Apache Causeway
@Configuration
@Import({
...
- IsisModuleSecuritySpring.class,
+ CausewayModuleSecuritySpring.class,
AuthorizorBypass.class,
SecurityConfig.class,
...
diff --git a/starters/adoc/modules/starters/pages/helloworld.adoc
b/starters/adoc/modules/starters/pages/helloworld.adoc
index 8caea69698..9de1ec5ade 100644
--- a/starters/adoc/modules/starters/pages/helloworld.adoc
+++ b/starters/adoc/modules/starters/pages/helloworld.adoc
@@ -336,17 +336,17 @@ In the case of the helloworld starter app *for the `jdo`
branch* the `AppManifes
----
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class, // <.>
- IsisModuleSecurityShiro.class, // <.>
- IsisModuleJdoDataNucleus5.class, // <.>
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, // <.>
- IsisModuleViewerWicketViewer.class, // <.>
+ CausewayModuleCoreRuntimeServices.class, // <.>
+ CausewayModuleSecurityShiro.class, // <.>
+ CausewayModuleJdoDataNucleus5.class, // <.>
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class, // <.>
+ CausewayModuleViewerWicketViewer.class, // <.>
- IsisModuleTestingH2ConsoleUi.class, // <.>
+ CausewayModuleTestingH2ConsoleUi.class, // <.>
HelloWorldModule.class // <.>
})
-@PropertySource(IsisPresets.NoTranslations) // <.>
+@PropertySource(CausewayPresets.NoTranslations) // <.>
public class AppManifest {
}
----
@@ -368,15 +368,15 @@ Optional (though if omitted then only
xref:userguide:fun:overview.adoc#view-mode
<.> References the application's module(s), in this case just the one,
`HelloWorldModule`.
<.> Normally configuration properties are picked up from Spring Boot's
`application.properties` or `application.yml` files, but additional properties
can be overridden directly.
-This particular one disables the framework's i18n support using the
`IsisPresets` convenience class.
+This particular one disables the framework's i18n support using the
`CausewayPresets` convenience class.
For the `jpa` branch the `AppManifest` is almost identical, just replacing:
-* `IsisModuleJdoDataNucleus5.class,`
+* `CausewayModuleJdoDataNucleus5.class,`
with:
-* `IsisModuleJpaEclipseLink.class,`
+* `CausewayModuleJpaEclipseLink.class,`
This bootstraps the JPA as the ORM instead of JDO.
@@ -396,7 +396,7 @@ public class HelloWorldApp
extends SpringBootServletInitializer {
public static void main(String[] args) {
- IsisPresets.prototyping(); // <.>
+ CausewayPresets.prototyping(); // <.>
SpringApplication.run(
new Class[] { HelloWorldApp.class }, args);
}
@@ -447,7 +447,7 @@ Typically this just holds JDBC connection strings, etc.
<.> The `menubars.layout.xml` arranges the actions of the domain services into
menus.
-<.> The `shiro.ini` file configures Shiro security integration (see the
`IsisModuleSecurityShiro` module imported in the `AppManifest`, above).
+<.> The `shiro.ini` file configures Shiro security integration (see the
`CausewayModuleSecurityShiro` module imported in the `AppManifest`, above).
+
[TIP]
====
diff --git a/starters/adoc/modules/starters/pages/simpleapp.adoc
b/starters/adoc/modules/starters/pages/simpleapp.adoc
index 6230c111e0..f3e1479b2e 100644
--- a/starters/adoc/modules/starters/pages/simpleapp.adoc
+++ b/starters/adoc/modules/starters/pages/simpleapp.adoc
@@ -561,21 +561,21 @@ The `SimpleModuleIntegTestAbstract` is the superclass of
all integration tests i
)
@ActiveProfiles("test") // <.>
public abstract class SimpleModuleIntegTestAbstract
- extends IsisIntegrationTestAbstractWithFixtures { // <.>
+ extends CausewayIntegrationTestAbstractWithFixtures { // <.>
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class, // <.>
- IsisModuleSecurityBypass.class, // <.>
- IsisModuleJdoDataNucleus5.class, // <.>
- IsisModuleTestingFixturesApplib.class, // <.>
+ CausewayModuleCoreRuntimeServices.class, // <.>
+ CausewayModuleSecurityBypass.class, // <.>
+ CausewayModuleJdoDataNucleus5.class, // <.>
+ CausewayModuleTestingFixturesApplib.class, // <.>
SimpleModule.class // <.>
})
@PropertySources({
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema), //
<.>
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate), //
<.>
- @PropertySource(IsisPresets.UseLog4j2Test), //
<.>
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
// <.>
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
// <.>
+ @PropertySource(CausewayPresets.UseLog4j2Test),
// <.>
})
public static class TestApp {
}
@@ -586,8 +586,8 @@ public abstract class SimpleModuleIntegTestAbstract
<.> Activates the "test" profile, which reads in additional configuration in
`application-test.yml"
-<.> Tests typically inherit from `IsisIntegrationTestAbstract`, which provides
some convenience methods to inherit from.
-In this case, the test inherits from the
`IsisIntegrationTestAbstractWithFixtures` subclass which also adds in support
for running fixtures.
+<.> Tests typically inherit from `CausewayIntegrationTestAbstract`, which
provides some convenience methods to inherit from.
+In this case, the test inherits from the
`CausewayIntegrationTestAbstractWithFixtures` subclass which also adds in
support for running fixtures.
<.> Specifies the modules that make up Apache Causeway framework itself.
These include core, security set to the bypass implementation (effectively is
ignored) and JDO/DataNucleus for persistence.
@@ -597,7 +597,7 @@ Note that no viewers are bootstrapped because the tests are
run through Spring's
<.> Configures JDO as the ORM.
+
-If using JPA, this would be `IsisModuleJpaEclipseLink.class` instead.
+If using JPA, this would be `CausewayModuleJpaEclipseLink.class` instead.
<.> Brings in support for running fixtures.
+
@@ -708,16 +708,16 @@ It looks like this:
----
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class, // <.>
- IsisModuleSecurityShiro.class, // <.>
- IsisModuleJpaEclipseLink.class, // <.>
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, // <.>
- IsisModuleViewerWicketViewer.class, // <.>
+ CausewayModuleCoreRuntimeServices.class, // <.>
+ CausewayModuleSecurityShiro.class, // <.>
+ CausewayModuleJpaEclipseLink.class, // <.>
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class, // <.>
+ CausewayModuleViewerWicketViewer.class, // <.>
- IsisModuleTestingH2ConsoleUi.class, // <.>
- IsisModuleTestingFixturesApplib.class, // <.>
+ CausewayModuleTestingH2ConsoleUi.class, // <.>
+ CausewayModuleTestingFixturesApplib.class, // <.>
- IsisModuleExtFlywayImpl.class, // <.>
+ CausewayModuleExtFlywayImpl.class, // <.>
ApplicationModule.class, // <.>
CustomModule.class, // <9>
@@ -726,7 +726,7 @@ It looks like this:
DomainAppDemo.class // <.>
})
@PropertySources({
- @PropertySource(IsisPresets.DebugDiscovery), // <.>
+ @PropertySource(CausewayPresets.DebugDiscovery), // <.>
})
public class AppManifest {
}
@@ -739,7 +739,7 @@ There are several security implementations, precisely one
must be selected
<.> Enables JPA/Eclipselink for persistence.
+
-If using JDO as the ORM, replace with `IsisModuleJdoDataNucleus5`.
+If using JDO as the ORM, replace with `CausewayModuleJdoDataNucleus5`.
<.> Enables the xref:vro:ROOT:about.adoc[REST API (Restful Objects viewer)]
(ie REST API).
@@ -758,7 +758,7 @@ If using JDO as the ORM, replace with
`IsisModuleJdoDataNucleus5`.
<.> Makes the fixture scenario classes available for discovery.
<.> Normally configuration properties are picked up from Spring Boot's
`application.properties` or `application.yml` files, but additional properties
can be overridden directly.
-These two both use the `IsisPresets` convenience class, to disable i18n
support and for additional debugging log statements.
+These two both use the `CausewayPresets` convenience class, to disable i18n
support and for additional debugging log statements.
==== SimpleApp
@@ -776,7 +776,7 @@ public class SimpleApp
extends SpringBootServletInitializer {
public static void main(String[] args) {
- IsisPresets.prototyping(); // <.>
+ CausewayPresets.prototyping(); // <.>
SpringApplication.run(
new Class[] { SimpleApp.class }, args);
}
@@ -833,7 +833,7 @@ This leverages a feature in Spring Boot's Flyway
integration which allows differ
<.> The `menubars.layout.xml` arranges the actions of the domain services into
menus.
-<.> The `shiro.ini` file configures Shiro security integration (see the
`IsisModuleSecurityShiro` module imported in the `AppManifest`, above).
+<.> The `shiro.ini` file configures Shiro security integration (see the
`CausewayModuleSecurityShiro` module imported in the `AppManifest`, above).
+
[TIP]
====
diff --git
a/testing/archtestsupport/adoc/modules/archtestsupport/pages/about.adoc
b/testing/archtestsupport/adoc/modules/archtestsupport/pages/about.adoc
index c2d51bb756..5895e5ad3c 100644
--- a/testing/archtestsupport/adoc/modules/archtestsupport/pages/about.adoc
+++ b/testing/archtestsupport/adoc/modules/archtestsupport/pages/about.adoc
@@ -184,7 +184,7 @@ Entity rule checks are provided for both
xref:pjpa::about.adoc[] and xref:pjdo::
+
Required in almost all cases:
-*** `every_jpa_Entity_must_be_annotated_as_an_IsisEntityListener()`
+*** `every_jpa_Entity_must_be_annotated_as_an_CausewayEntityListener()`
** ensure entities can be referenced in JAXB view models:
+
diff --git a/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
b/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
index 222f2dfdcb..a8757f3f95 100644
--- a/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
+++ b/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
@@ -113,9 +113,9 @@ This provides numerous methods, each for a specific data
type, providing an obje
*More specialized value types*
-*
xref:refguide:testing:index/fakedata/applib/services/IsisBlobs.adoc[IsisBlobs]
-*
xref:refguide:testing:index/fakedata/applib/services/IsisClobs.adoc[IsisClobs]
-*
xref:refguide:testing:index/fakedata/applib/services/IsisPasswords.adoc[IsisPasswords]
+*
xref:refguide:testing:index/fakedata/applib/services/CausewayBlobs.adoc[CausewayBlobs]
+*
xref:refguide:testing:index/fakedata/applib/services/CausewayClobs.adoc[CausewayClobs]
+*
xref:refguide:testing:index/fakedata/applib/services/CausewayPasswords.adoc[CausewayPasswords]
|
*Dates and times*
diff --git
a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
index c4d9283d4f..22f9b03645 100644
--- a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
+++ b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
@@ -75,7 +75,7 @@
include::testing:ROOT:partial$surefire-configuration-caution.adoc[]
=== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `IsisModuleTestingIntegTestSupportApplib` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `CausewayModuleTestingIntegTestSupportApplib`
module:
[source,java]
.AppManifest.java
@@ -83,7 +83,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleTestingIntegTestApplib.class,
+ CausewayModuleTestingIntegTestApplib.class,
...
})
public class AppManifest {
@@ -106,18 +106,18 @@ So, for the `module-simple` module, we have:
classes = SimpleModuleIntegTestAbstract.AppManifest.class
)
@TestPropertySource({
- IsisPresets.H2InMemory_withUniqueSchema,
- IsisPresets.DataNucleusAutoCreate,
- IsisPresets.UseLog4j2Test,
+ CausewayPresets.H2InMemory_withUniqueSchema,
+ CausewayPresets.DataNucleusAutoCreate,
+ CausewayPresets.UseLog4j2Test,
})
-public abstract class SimpleModuleIntegTestAbstract extends
IsisIntegrationTestAbstractWithFixtures {
+public abstract class SimpleModuleIntegTestAbstract extends
CausewayIntegrationTestAbstractWithFixtures {
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class,
- IsisModuleSecurityBypass.class,
- IsisModuleJdoDataNucleus5.class,
- IsisModuleTestingFixturesApplib.class,
+ CausewayModuleCoreRuntimeServices.class,
+ CausewayModuleSecurityBypass.class,
+ CausewayModuleJdoDataNucleus5.class,
+ CausewayModuleTestingFixturesApplib.class,
SimpleModule.class //<1>
})
public static class AppManifest {
@@ -135,19 +135,19 @@ while in the `webapp` module we have:
classes = ApplicationIntegTestAbstract.AppManifest.class
)
@TestPropertySource({
- IsisPresets.H2InMemory_withUniqueSchema,
- IsisPresets.DataNucleusAutoCreate,
- IsisPresets.UseLog4j2Test,
+ CausewayPresets.H2InMemory_withUniqueSchema,
+ CausewayPresets.DataNucleusAutoCreate,
+ CausewayPresets.UseLog4j2Test,
})
@ContextConfiguration
-public abstract class ApplicationIntegTestAbstract extends
IsisIntegrationTestAbstract {
+public abstract class ApplicationIntegTestAbstract extends
CausewayIntegrationTestAbstract {
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class,
- IsisModuleJdoDataNucleus5.class,
- IsisModuleSecurityBypass.class,
- IsisModuleTestingFixturesApplib.class,
+ CausewayModuleCoreRuntimeServices.class,
+ CausewayModuleJdoDataNucleus5.class,
+ CausewayModuleSecurityBypass.class,
+ CausewayModuleTestingFixturesApplib.class,
ApplicationModule.class //<1>
})
public static class AppManifest {
@@ -172,7 +172,7 @@ This can be done by adding:
[source,java]
----
-@TestPropertySource(IsisPresets.IntrospectLazily)
+@TestPropertySource(CausewayPresets.IntrospectLazily)
----
@@ -406,9 +406,9 @@ public class SimpleObject_IntegTest extends
SimpleModuleIntegTestAbstract {
Some of the methods being called here are inherited from the superclass, so
let's look at that next.
-== IsisIntegrationTestAbstract
+== CausewayIntegrationTestAbstract
-For convenience the framework provides the `IsisIntegrationTestAbstract` as a
base class for integration tests.
+For convenience the framework provides the `CausewayIntegrationTestAbstract`
as a base class for integration tests.
This is the class that provides the `wrap(...)` method (as see in the
xref:about.adoc#typical-usage[previous section]).
diff --git
a/testing/integtestsupport/adoc/modules/integtestsupport/pages/influencing-the-interaction.adoc
b/testing/integtestsupport/adoc/modules/integtestsupport/pages/influencing-the-interaction.adoc
index dba08f6bfa..5c38e3a0e1 100644
---
a/testing/integtestsupport/adoc/modules/integtestsupport/pages/influencing-the-interaction.adoc
+++
b/testing/integtestsupport/adoc/modules/integtestsupport/pages/influencing-the-interaction.adoc
@@ -54,7 +54,7 @@ The `NoPermissionChecks` JUnit 5 extension ensures that the
user has this role,
[source,java]
----
@ExtendWith(NoPermissionChecks.class)
-public class MyIntegrationTest extends IsisIntegrationTestAbstract {
+public class MyIntegrationTest extends CausewayIntegrationTestAbstract {
// ...
}
----
@@ -72,7 +72,7 @@ For example:
[source,java]
----
@ExtendWith({UserMementoRefiners.class})
-public class MyIntegTest extends IsisIntegrationTestAbstract {
+public class MyIntegTest extends CausewayIntegrationTestAbstract {
@SpringBootConfiguration
@EnableAutoConfiguration
diff --git
a/testing/integtestsupport/adoc/modules/integtestsupport/pages/swagger-exporter.adoc
b/testing/integtestsupport/adoc/modules/integtestsupport/pages/swagger-exporter.adoc
index cdadd23aba..fed88c8555 100644
---
a/testing/integtestsupport/adoc/modules/integtestsupport/pages/swagger-exporter.adoc
+++
b/testing/integtestsupport/adoc/modules/integtestsupport/pages/swagger-exporter.adoc
@@ -16,7 +16,7 @@ The example below is taken from the
xref:docs:starters:simpleapp.adoc[simpleapp]
@SpringBootTest(
classes = {
ApplicationIntegTestAbstract.AppManifest.class, // <1>
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class // <2>
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class // <2>
}
)
class SwaggerExport_IntegTest extends ApplicationIntegTestAbstract {
diff --git a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
index 11a62c6eb4..7c641a2da1 100644
--- a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
+++ b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
@@ -81,7 +81,7 @@
include::testing:ROOT:partial$surefire-configuration-caution.adoc[]
=== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `IsisModuleTestingSpecSupportApplib` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `CausewayModuleTestingSpecSupportApplib` module:
[source,java]
.AppManifest.java
@@ -89,7 +89,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleTestingSpecSupportApplib.class,
+ CausewayModuleTestingSpecSupportApplib.class,
...
})
public class AppManifest {
diff --git
a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
index 6d6d6599c6..cb1b9aed82 100644
--- a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
+++ b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
@@ -65,7 +65,7 @@
include::testing:ROOT:partial$surefire-configuration-caution.adoc[]
=== Update AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `IsisModuleTestingUnitTestSupportApplib` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to
bootstrap the app), import the `CausewayModuleTestingUnitTestSupportApplib`
module:
[source,java]
.AppManifest.java
@@ -73,7 +73,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleTestingUnitTestSupportApplib.class,
+ CausewayModuleTestingUnitTestSupportApplib.class,
...
})
public class AppManifest {
diff --git
a/viewers/restfulobjects/adoc/modules/ROOT/pages/setup-and-configuration.adoc
b/viewers/restfulobjects/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index 731c3bbf2d..0880a18352 100644
---
a/viewers/restfulobjects/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++
b/viewers/restfulobjects/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -19,7 +19,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleViewerRestfulObjectsViewer.class,
+ CausewayModuleViewerRestfulObjectsViewer.class,
...
})
public class AppManifest {
diff --git
a/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
index 1a007c9fb6..0f5a4a7ea4 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
@@ -3,6 +3,7 @@
: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: out of date...
From link:http://causeway.markmail.org/thread/kb4442niwwbnghey[this thread] on
the Apache Causeway users mailing list:
@@ -19,14 +20,14 @@ public class UserSettingsThemeProvider implements
ActiveThemeProvider {
...
@Override
public ITheme getActiveTheme() {
- if(IsisContext.getSpecificationLoader().isInitialized()) {
- final String themeName = IsisContext.doInSession(new
Callable<String>() {
+ if(CausewayContext.getSpecificationLoader().isInitialized()) {
+ final String themeName = CausewayContext.doInSession(new
Callable<String>() {
@Override
public String call() throws Exception {
final UserSettingsService userSettingsService =
lookupService(UserSettingsService.class);
final UserSetting activeTheme = userSettingsService.find(
-
IsisContext.getAuthenticationSession().getUserName(),
+
CausewayContext.getAuthenticationSession().getUserName(),
ACTIVE_THEME);
return activeTheme != null ? activeTheme.valueAsString() :
null;
}
@@ -37,11 +38,11 @@ public class UserSettingsThemeProvider implements
ActiveThemeProvider {
}
@Override
public void setActiveTheme(final String themeName) {
- IsisContext.doInSession(new Runnable() {
+ CausewayContext.doInSession(new Runnable() {
@Override
public void run() {
final String currentUsrName =
- IsisContext.getAuthenticationSession().getUserName();
+ CausewayContext.getAuthenticationSession().getUserName();
final UserSettingsServiceRW userSettingsService =
lookupService(UserSettingsServiceRW.class);
final UserSettingJdo activeTheme =
diff --git
a/viewers/wicket/adoc/modules/ROOT/pages/setup-and-configuration.adoc
b/viewers/wicket/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index 362c1d905f..8aad81ddbf 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -19,7 +19,7 @@ In your application's `AppManifest` (top-level Spring
`@Configuration` used to b
@Configuration
@Import({
...
- IsisModuleViewerWicketViewer.class,
+ CausewayModuleViewerWicketViewer.class,
...
})
public class AppManifest {
@@ -99,7 +99,7 @@ One way to do this is using the Spring
link:https://docs.spring.io/spring/docs/c
@Configuration
@Import({
// ...
- IsisModuleViewerWicketViewer.class,
+ CausewayModuleViewerWicketViewer.class,
// ...
})
