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 2831964c7bfa634631daa71e425b43c72e5e2c50 Author: Dan Haywood <[email protected]> AuthorDate: Sun Oct 23 13:05:54 2022 +0100 ISIS-3260: renames 'Isis' -> 'Causeway' (partial match) in all .adoc files (cherry picked from commit c10cae87badd7acc442493847a0162c60abdb4e5) --- .../modules/ROOT/pages/merging-a-pull-request.adoc | 2 +- .../modules/ROOT/pages/post-release-successful.adoc | 2 +- antora/components/docs/modules/ROOT/pages/about.adoc | 2 +- .../docs/modules/ROOT/pages/going-deeper/books.adoc | 2 +- .../ROOT/partials/module-nav/further-resources.adoc | 2 +- .../docs/modules/resources/pages/cheatsheet.adoc | 4 ++-- antora/components/docs/modules/support/pages/about.adoc | 2 +- .../ConfigurationViewService_020-examples-and-usage.adoc | 4 ++-- .../hooks/SwaggerService_020-examples-and-usage.adoc | 2 +- .../tutorials/modules/petclinic/pages/040-pet-entity.adoc | 2 +- .../modules/petclinic/pages/050-visit-entity.adoc | 2 +- .../modules/petclinic/pages/090-integration-testing.adoc | 14 +++++++------- .../domain-entities-and-services/domain-services.adoc | 6 +++--- .../domain-entities-and-services/inject-services.adoc | 4 ++-- antora/components/userguide/modules/fun/pages/modules.adoc | 14 +++++++------- .../modules/fun/pages/object-members/properties.adoc | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc b/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc index 0b59647c5a..729ec97d3a 100644 --- a/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc +++ b/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc @@ -103,7 +103,7 @@ From https://github.com/sebadiaz/causeway Auto-merging core/pom.xml Merge made by the 'recursive' strategy. core/pom.xml | 3 +- - .../apache/causeway/security/shiro/IsisLdapRealm.java | 198 +++++++++++++++++++-- + .../apache/causeway/security/shiro/CausewayLdapRealm.java | 198 +++++++++++++++++++-- 2 files changed, 186 insertions(+), 15 deletions(-) Merged the PR; hit enter to build diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc index 6fb3671d57..9c86ff7520 100644 --- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc +++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc @@ -516,7 +516,7 @@ Examples: link:https://lists.apache.org/list.html?announce\@apache.org[https://l == Social Media -Announce the release using the `@ApacheIsis` Twitter account. +Announce the release using the `@ApacheCauseway` Twitter account. diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc index 2dfec722d0..4391efa2d9 100644 --- a/antora/components/docs/modules/ROOT/pages/about.adoc +++ b/antora/components/docs/modules/ROOT/pages/about.adoc @@ -162,7 +162,7 @@ _Reading_ _Academia_ * link:{attachmentsdir}/Pawson-Naked-Objects-thesis.pdf[Naked Objects] (PhD thesis, Pawson) -* link:https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn) +* link:https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLCauseway: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn) * link:https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis) diff --git a/antora/components/docs/modules/ROOT/pages/going-deeper/books.adoc b/antora/components/docs/modules/ROOT/pages/going-deeper/books.adoc index 8ed04057ad..e59e7d4027 100644 --- a/antora/components/docs/modules/ROOT/pages/going-deeper/books.adoc +++ b/antora/components/docs/modules/ROOT/pages/going-deeper/books.adoc @@ -5,7 +5,7 @@ -Although it has evolved since, the _Apache Isis_ framework started out as an open source implementation of the naked objects pattern. +Although it has evolved since, the _Apache Causeway_ framework started out as an open source implementation of the naked objects pattern. Indeed, the generic user interfaces provided by Apache Causeway xref:vw:ROOT:about.adoc[Wicket] viewer and the xref:vro:ROOT:about.adoc[Restful Objects] viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings. If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read. diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/further-resources.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/further-resources.adoc index 0d1f4d305e..ef88d22779 100644 --- a/antora/components/docs/modules/ROOT/partials/module-nav/further-resources.adoc +++ b/antora/components/docs/modules/ROOT/partials/module-nav/further-resources.adoc @@ -12,6 +12,6 @@ ** Academia *** link:{attachmentsdir}/Pawson-Naked-Objects-thesis.pdf[Naked Objects] (PhD thesis, Pawson) -*** link:https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn) +*** link:https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLCauseway: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn) *** link:https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis) diff --git a/antora/components/docs/modules/resources/pages/cheatsheet.adoc b/antora/components/docs/modules/resources/pages/cheatsheet.adoc index b210297e85..f17318aaa5 100644 --- a/antora/components/docs/modules/resources/pages/cheatsheet.adoc +++ b/antora/components/docs/modules/resources/pages/cheatsheet.adoc @@ -8,10 +8,10 @@ This cheat sheet summarises the main programming conventions to follow when writ pass:[<br/>] -image::IsisCheatSheet.png[width="800px",link="{attachmentsdir}/IsisCheatSheet.pdf"] +image::CausewayCheatSheet.png[width="800px",link="{attachmentsdir}/CausewayCheatSheet.pdf"] pass:[<br/>] You can download the cheat sheet as either an -link:{attachmentsdir}/IsisCheatSheet.pdf[Acrobat PDF] file or as an link:{attachmentsdir}/IsisCheatSheet.odt[Open Document .odt] file. +link:{attachmentsdir}/CausewayCheatSheet.pdf[Acrobat PDF] file or as an link:{attachmentsdir}/CausewayCheatSheet.odt[Open Document .odt] file. diff --git a/antora/components/docs/modules/support/pages/about.adoc b/antora/components/docs/modules/support/pages/about.adoc index 81d1c8182e..dfce9d16eb 100644 --- a/antora/components/docs/modules/support/pages/about.adoc +++ b/antora/components/docs/modules/support/pages/about.adoc @@ -21,5 +21,5 @@ If you think you've found a bug or want to raise an enhancement request, go to: Some other places that might be useful are: * link:https://cwiki.apache.org/confluence/display/CAUSEWAY/Index[ASF Wiki] -* link:https://twitter.com/ApacheIsis[Twitter] +* link:https://twitter.com/ApacheCauseway[Twitter] diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc index 2d09e72433..59e8961fe0 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc @@ -4,12 +4,12 @@ == Related Services -* The configuration properties for Apache Causeway can also be obtained from the xref:refguide:config:about.adoc#isisconfiguration-domain-service[IsisConfiguration] domain service. +* The configuration properties for Apache Causeway can also be obtained from the xref:refguide:config:about.adoc#isisconfiguration-domain-service[CausewayConfiguration] domain service. These provide link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config-typesafe-configuration-properties[type-safe] access to all `causeway.*` configuration properties. + [NOTE] ==== -`IsisConfiguration` is part of xref:refguide:config:about.adoc[causeway-core-config] rather than the applib. +`CausewayConfiguration` is part of xref:refguide:config:about.adoc[causeway-core-config] rather than the applib. To use it therefore requires this dependency: [source,xml] diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc index f660dabfc7..fedb349b2f 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc @@ -28,7 +28,7 @@ An example of its use can be found in the demo app: .SwaggerExport_IntegTest.java ---- @Import({ - IsisModuleViewerRestfulObjectsJaxrsResteasy4.class + CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class }) class SwaggerExport_IntegTest extends ApplicationIntegTestAbstract { diff --git a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc index 8538031d46..3053da0f56 100644 --- a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc +++ b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc @@ -57,7 +57,7 @@ public @interface PetName { @UniqueConstraint(name = "Pet__owner_name__UNQ", columnNames = {"owner_id, name"}) } ) -@EntityListeners(IsisEntityListener.class) +@EntityListeners(CausewayEntityListener.class) @Named("pets.Pet") @DomainObject(entityChangePublishing = Publishing.ENABLED) @DomainObjectLayout() diff --git a/antora/components/tutorials/modules/petclinic/pages/050-visit-entity.adoc b/antora/components/tutorials/modules/petclinic/pages/050-visit-entity.adoc index 27754b1350..de92e13f46 100644 --- a/antora/components/tutorials/modules/petclinic/pages/050-visit-entity.adoc +++ b/antora/components/tutorials/modules/petclinic/pages/050-visit-entity.adoc @@ -103,7 +103,7 @@ mvn -pl spring-boot:run @UniqueConstraint(name = "Visit__pet_visitAt__UNQ", columnNames = {"owner_id", "name"}) } ) -@EntityListeners(IsisEntityListener.class) +@EntityListeners(CausewayEntityListener.class) @Named("visits.Visit") @DomainObject(entityChangePublishing = Publishing.ENABLED) @DomainObjectLayout() diff --git a/antora/components/tutorials/modules/petclinic/pages/090-integration-testing.adoc b/antora/components/tutorials/modules/petclinic/pages/090-integration-testing.adoc index 0a854ef021..425257ee68 100644 --- a/antora/components/tutorials/modules/petclinic/pages/090-integration-testing.adoc +++ b/antora/components/tutorials/modules/petclinic/pages/090-integration-testing.adoc @@ -47,22 +47,22 @@ mvn clean package jetty:run ) @ActiveProfiles("test") public abstract class VisitsModuleIntegTestAbstract - extends IsisIntegrationTestAbstractWithFixtures { + extends CausewayIntegrationTestAbstractWithFixtures { @SpringBootConfiguration @EnableAutoConfiguration @Import({ - IsisModuleCoreRuntimeServices.class, - IsisModuleSecurityBypass.class, - IsisModulePersistenceJpaEclipselink.class, - IsisModuleTestingFixturesApplib.class, + CausewayModuleCoreRuntimeServices.class, + CausewayModuleSecurityBypass.class, + CausewayModulePersistenceJpaEclipselink.class, + CausewayModuleTestingFixturesApplib.class, VisitsModule.class }) @PropertySources({ - @PropertySource(IsisPresets.H2InMemory_withUniqueSchema), - @PropertySource(IsisPresets.UseLog4j2Test), + @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), + @PropertySource(CausewayPresets.UseLog4j2Test), }) public static class TestApp { } diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc index bed22a62ba..2dfc63f05f 100644 --- a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc +++ b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc @@ -23,7 +23,7 @@ This section looks at the programming model for writing your own domain services == Nature of Service Apache Causeway uses Spring Boot to instantiate and manage the dependency injection of domain services. -The vast majority of these are singleton (application) scoped; a smaller number are request scoped (using the xref:refguide:applib:index/annotation/InteractionScope.adoc[@IsisSessionScope] annotation). +The vast majority of these are singleton (application) scoped; a smaller number are request scoped (using the xref:refguide:applib:index/annotation/InteractionScope.adoc[@CausewaySessionScope] annotation). Accordingly, all domain services are annotated or meta-annotated using Spring's link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/stereotype/Component.html[@Component] annotation. @@ -197,7 +197,7 @@ Sometimes though a service's lifetime is applicable only to a single (http) requ The framework has a number of such services, including a xref:refguide:applib:index/services/scratchpad/Scratchpad.adoc[Scratchpad] service (to share adhoc data between methods), and xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache], which as its name suggests will cache query results. Such services _do_ hold state, but that state is scoped per (possibly concurrent) request and should be removed afterwards. -The requirement for request-scoped services is supported using Apache Causeway' own xref:refguide:applib:index/annotation/InteractionScope.adoc[@IsisSessionScope] annotation (named because a short-lived `IsisSession` is created for each request). +The requirement for request-scoped services is supported using Apache Causeway' own xref:refguide:applib:index/annotation/InteractionScope.adoc[@CausewaySessionScope] annotation (named because a short-lived `CausewaySession` is created for each request). This is used by the framework services and can also be used for user-defined services. For example: @@ -205,7 +205,7 @@ For example: [source,java] ---- @Service -@IsisSessionScope +@CausewaySessionScope public class MyService { ... public void doSomething() { ... } diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc index 0bb400860c..2079c22d94 100644 --- a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc +++ b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc @@ -173,11 +173,11 @@ The framework provides a simple logging implementation, which will always be cal All other implementations available will also be called. -== Injecting `IsisSessionScope`d services +== Injecting `CausewaySessionScope`d services Most domain services are application-scoped, in other words they are stateless global singletons that are shared by all concurrent requests. -A small number of framework-provided services are annotated using xref:refguide:applib:index/annotation/InteractionScope.adoc[@IsisSessionScope]. +A small number of framework-provided services are annotated using xref:refguide:applib:index/annotation/InteractionScope.adoc[@CausewaySessionScope]. This means that they are stateful and scoped with each causeway session, in other words HTTP request. One such service is xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache], used for performance caching. diff --git a/antora/components/userguide/modules/fun/pages/modules.adoc b/antora/components/userguide/modules/fun/pages/modules.adoc index d2f1ad4272..12e5511f0d 100644 --- a/antora/components/userguide/modules/fun/pages/modules.adoc +++ b/antora/components/userguide/modules/fun/pages/modules.adoc @@ -24,13 +24,13 @@ This: * in the applib, has a top-level package of `org.apache.causeway.extensions.excel.applib` -* defines a Spring configuration module called `IsisModuleExtExcelApplib`, that is simply: +* defines a Spring configuration module called `CausewayModuleExtExcelApplib`, that is simply: + [source,java] ---- @Configuration @ComponentScan // <.> -public class IsisModuleExtExcelApplib { +public class CausewayModuleExtExcelApplib { } ---- <.> the link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/ComponentScan.html[@ComponentScan] indicates that the classpath should be scanned for domain services, entities and xref:testing:fixtures:about.adoc[fixture scripts]. @@ -66,16 +66,16 @@ Therefore: </dependency> ---- -* and in the testing module's `IsisModuleExtExcelTesting` we see: +* and in the testing module's `CausewayModuleExtExcelTesting` we see: + [source,java] ---- @Configuration @Import({ // <.> - IsisModuleExtExcelApplib.class + CausewayModuleExtExcelApplib.class }) @ComponentScan -public class IsisModuleExtExcelTesting { +public class CausewayModuleExtExcelTesting { } ---- <.> The link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Import.html[@Import] annotation declares the dependency. @@ -92,7 +92,7 @@ package com.mycompany.modules.customer; @Configuration // <.> @Import({ - IsisModuleExtExcelApplib.class // <.> + CausewayModuleExtExcelApplib.class // <.> }) @ComponentScan // <.> public class CustomerModule {} @@ -112,7 +112,7 @@ import org.apache.causeway.applib.annotation.Module; @Module @Import({ - IsisModuleExtExcelApplib.class + CausewayModuleExtExcelApplib.class }) public class CustomerModule {} ---- diff --git a/antora/components/userguide/modules/fun/pages/object-members/properties.adoc b/antora/components/userguide/modules/fun/pages/object-members/properties.adoc index 6140e5f9e6..a9f1d0dd9e 100644 --- a/antora/components/userguide/modules/fun/pages/object-members/properties.adoc +++ b/antora/components/userguide/modules/fun/pages/object-members/properties.adoc @@ -337,7 +337,7 @@ import lombok.Setter; private Blob attachment; ---- -The three `@Column` annotations are required because the mapping classes that Apache Causeway provides (https://github.com/apache/causeway/blob/causeway-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/causeway/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java#L59[IsisBlobMapping] and https://github.com/apache/causeway/blob/causeway-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/causeway/objectstore/jdo/datanucleus/valuetypes/Is [...] +The three `@Column` annotations are required because the mapping classes that Apache Causeway provides (https://github.com/apache/causeway/blob/causeway-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/causeway/objectstore/jdo/datanucleus/valuetypes/CausewayBlobMapping.java#L59[CausewayBlobMapping] and https://github.com/apache/causeway/blob/causeway-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/causeway/objectstore/jdo/datanucleus/value [...] (It is not an error to omit these `@Column` annotations, but without them the names of the table columns are simply suffixed `_0`, `_1`, `_2` etc. If the `Blob` is mandatory, then use:
