You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/24 09:45:57 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated: framework-rename: batch rename isis->causeway
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new 8cc6c58 framework-rename: batch rename isis->causeway
8cc6c58 is described below
commit 8cc6c5875e6a23247ccf020d1050aaba9e1b255c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 24 11:45:46 2022 +0200
framework-rename: batch rename isis->causeway
---
README.adoc | 14 +--
module-simple-tests/pom.xml | 22 ++---
.../modules/simple/dom/so/SimpleObject_Test.java | 8 +-
.../modules/simple/dom/so/SimpleObjects_Test.java | 4 +-
.../integtests/SimpleModuleIntegTestAbstract.java | 28 +++---
.../integtests/tests/SimpleObject_IntegTest.java | 4 +-
.../integtests/tests/SimpleObjects_IntegTest.java | 10 +-
.../src/test/resources/application-test.yml | 2 +-
module-simple/pom.xml | 28 +++---
.../domainapp/modules/simple/SimpleModule.java | 22 ++---
.../modules/simple/dom/so/SimpleObject.java | 60 ++++++------
.../modules/simple/dom/so/SimpleObject.layout.xml | 2 +-
.../modules/simple/dom/so/SimpleObjects.java | 22 ++---
.../simple/fixture/SimpleObject_persona.java | 14 +--
.../java/domainapp/modules/simple/types/Name.java | 6 +-
.../java/domainapp/modules/simple/types/Notes.java | 12 +--
pom.xml | 10 +-
update-parent.sh | 6 +-
webapp-tests/log4j2-test.xml | 4 +-
webapp-tests/pom.xml | 14 +--
.../webapp/integtests/WebAppIntegTestAbstract.java | 28 +++---
.../metamodel/SwaggerExport_IntegTest.java | 12 +--
.../metamodel/ValidateDomainModel_IntegTest.java | 4 +-
.../webapp/integtests/smoke/Smoke_IntegTest.java | 4 +-
.../src/test/resources/application-test.yml | 2 +-
webapp/pom.xml | 74 +++++++-------
.../main/java/domainapp/webapp/AppManifest.java | 96 +++++++++----------
.../src/main/java/domainapp/webapp/SimpleApp.java | 4 +-
.../fixture/scenarios/DomainAppDemo.java | 4 +-
.../application/seed/CustomRolesAndUsers.java | 22 ++---
.../application/seed/SeedSecurityService.java | 16 ++--
.../services/health/HealthCheckServiceImpl.java | 4 +-
.../services/homepage/HomePageViewModel.java | 20 ++--
.../services/homepage/HomePageViewModel.layout.xml | 2 +-
.../webapp/custom/restapi/CustomController.java | 8 +-
.../domainapp/webapp/quartz/job/SampleJob.java | 8 +-
webapp/src/main/resources/application.yml | 14 +--
.../config/application-SQLSERVER.properties | 4 +-
.../main/resources/config/application.properties | 8 +-
webapp/src/main/resources/log4j2-spring.xml | 32 +++----
webapp/src/main/resources/menubars.layout.xml | 106 ++++++++++-----------
webapp/src/main/resources/shiro.ini | 20 ++--
.../logo-48x48.png | Bin
.../{apache-isis => apache-causeway}/logo.png | Bin
webapp/src/main/resources/static/index.html | 6 +-
webapp/src/main/resources/templates/error.html | 4 +-
46 files changed, 397 insertions(+), 397 deletions(-)
diff --git a/README.adoc b/README.adoc
index 7ab5af7..9a48526 100644
--- a/README.adoc
+++ b/README.adoc
@@ -2,10 +2,10 @@
:toc:
:toc-placement!:
-image:https://github.com/apache/isis-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%208/badge.svg[]
-image:https://github.com/apache/isis-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%2015/badge.svg[]
+image:https://github.com/apache/causeway-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%208/badge.svg[]
+image:https://github.com/apache/causeway-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%2015/badge.svg[]
-This is a simple link:http://isis.apache.org[Apache Isis] application, structured so that it can be used as a starting point for developing your own applications.
+This is a simple link:http://causeway.apache.org[Apache Causeway] application, structured so that it can be used as a starting point for developing your own applications.
It consists of:
@@ -16,7 +16,7 @@ You can easily remove these extensions (or add others) in the `AppManifest`.
[TIP]
====
-If all you want is get a feel for what the framework is all about, then take a look at the link:https://github.com/apache/isis-app-helloworld[HelloWorld] starter app, which has the bare minimum of configuration.
+If all you want is get a feel for what the framework is all about, then take a look at the link:https://github.com/apache/causeway-app-helloworld[HelloWorld] starter app, which has the bare minimum of configuration.
====
toc::[]
@@ -34,7 +34,7 @@ toc::[]
APP=simpleapp
BRANCH=master
-REPO=isis-app-$APP
+REPO=causeway-app-$APP
curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
mv $REPO-$BRANCH $REPO
cd $REPO
@@ -204,7 +204,7 @@ These outputs can for example be processed within/published by a continuous pipe
== Translations
-Apache Isis supports i18n using link:https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html[GNU .po file]s.
+Apache Causeway supports i18n using link:https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html[GNU .po file]s.
The `WEB-INF/translations.po` is the fallback (an empty value means that the key is used "as-is"), while `WEB-INF/translations-XX.po` files provide translations for each "XX" locale.
Translations are required for all domain classes and all members (actions, properties and collections) of all classes.
@@ -241,7 +241,7 @@ The presence of these is enough to enable the Flyway integration
+
This is explicitly set to `true`, to override the value in the default `config/application.properties`.
-* `isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll`
+* `causeway.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll`
+
This is set to `false`, also overriding the value in the default `config/application.properties`.
It instructs the JDO/DataNucleus object store not to automatically create any tables etc.
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 1ebb218..2edd058 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>simpleapp-jdo</artifactId>
- <groupId>org.apache.isis.starters</groupId>
+ <groupId>org.apache.causeway.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -45,32 +45,32 @@
<!-- TESTS -->
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-unittestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fakedata-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fixtures-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jdo-datanucleus</artifactId>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
<scope>test</scope>
</dependency>
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java b/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
index 922b077..e0f7a64 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
@@ -11,9 +11,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.title.TitleService;
+import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.applib.services.title.TitleService;
@ExtendWith(MockitoExtension.class)
class SimpleObject_Test {
@@ -68,4 +68,4 @@ class SimpleObject_Test {
verify(mockRepositoryService).removeAndFlush(object);
}
}
-}
\ No newline at end of file
+}
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
index 60be5fa..d9f1a76 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
@@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.when;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.persistence.jdo.applib.services.JdoSupportService;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
@ExtendWith(MockitoExtension.class)
class SimpleObjects_Test {
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index d94c5f9..4faab71 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -8,12 +8,12 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
-import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import domainapp.modules.simple.SimpleModule;
@@ -22,7 +22,7 @@ import domainapp.modules.simple.SimpleModule;
classes = SimpleModuleIntegTestAbstract.TestApp.class
)
@ActiveProfiles("test")
-public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
+public abstract class SimpleModuleIntegTestAbstract extends CausewayIntegrationTestAbstractWithFixtures {
/**
* Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
@@ -32,17 +32,17 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
@EnableAutoConfiguration
@Import({
- IsisModuleCoreRuntimeServices.class,
- IsisModuleSecurityBypass.class,
- IsisModulePersistenceJdoDatanucleus.class,
- IsisModuleTestingFixturesApplib.class,
+ CausewayModuleCoreRuntimeServices.class,
+ CausewayModuleSecurityBypass.class,
+ CausewayModulePersistenceJdoDatanucleus.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 {
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 761bb86..d75aec9 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -8,8 +8,8 @@ import org.springframework.transaction.annotation.Transactional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
+import org.apache.causeway.applib.services.wrapper.DisabledException;
+import org.apache.causeway.applib.services.wrapper.InvalidException;
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.fixture.SimpleObject_persona;
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 748edd9..24ef373 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -21,11 +21,11 @@ import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.applib.services.iactnlayer.InteractionService;
-import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.commons.functional.Try;
-import org.apache.isis.persistence.jdo.spring.exceptions.JdoResourceFailureException;
-import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoResourceFailureException;
+import org.apache.causeway.testing.unittestsupport.applib.matchers.ThrowableMatchers;
import lombok.val;
diff --git a/module-simple-tests/src/test/resources/application-test.yml b/module-simple-tests/src/test/resources/application-test.yml
index 3a68cae..8d13e94 100644
--- a/module-simple-tests/src/test/resources/application-test.yml
+++ b/module-simple-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
-isis:
+causeway:
persistence:
schema:
auto-create-schemas: "simple"
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index ce676f4..84f5b02 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>simpleapp-jdo</artifactId>
- <groupId>org.apache.isis.starters</groupId>
+ <groupId>org.apache.causeway.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -33,36 +33,36 @@
<dependencies>
- <!-- ISIS API -->
+ <!-- CAUSEWAY API -->
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fakedata-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-fullcalendar-applib</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-fullcalendar-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-pdfjs-applib</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-pdfjs-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jdo-datanucleus</artifactId>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fixtures-applib</artifactId>
</dependency>
<!-- IDE support (optional) -->
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 8a09d34..2dbd502 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -4,22 +4,22 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fullcalendar.applib.IsisModuleExtFullCalendarApplib;
-import org.apache.isis.extensions.pdfjs.applib.IsisModuleExtPdfjsApplibModel;
-import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
-import org.apache.isis.testing.fakedata.applib.IsisModuleTestingFakeDataApplib;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
+import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
+import org.apache.causeway.extensions.pdfjs.applib.CausewayModuleExtPdfjsApplibModel;
+import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
+import org.apache.causeway.testing.fakedata.applib.CausewayModuleTestingFakeDataApplib;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
+import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
import domainapp.modules.simple.dom.so.SimpleObject;
@Configuration
@Import({
- IsisModuleExtPdfjsApplibModel.class,
- IsisModuleExtFullCalendarApplib.class,
- IsisModuleTestingFakeDataApplib.class,
- IsisModulePersistenceJdoApplib.class
+ CausewayModuleExtPdfjsApplibModel.class,
+ CausewayModuleExtFullCalendarApplib.class,
+ CausewayModuleTestingFakeDataApplib.class,
+ CausewayModulePersistenceJdoApplib.class
})
@ComponentScan
public class SimpleModule implements ModuleWithFixtures {
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 4f7e790..0a4a3bf 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -24,36 +24,36 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.MemberSupport;
-import org.apache.isis.applib.annotation.Optionality;
-import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.TableDecoration;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
-import org.apache.isis.applib.layout.LayoutConstants;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.iactnlayer.InteractionContext;
-import org.apache.isis.applib.services.iactnlayer.InteractionService;
-import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.services.user.UserCurrentSessionTimeZoneHolder;
-import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.fullcalendar.applib.CalendarEventable;
-import org.apache.isis.extensions.fullcalendar.applib.value.CalendarEvent;
-import org.apache.isis.extensions.pdfjs.applib.annotations.PdfJsViewer;
-
-import static org.apache.isis.applib.annotation.SemanticsOf.IDEMPOTENT;
-import static org.apache.isis.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE;
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.Optionality;
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.applib.annotation.TableDecoration;
+import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.applib.layout.LayoutConstants;
+import org.apache.causeway.applib.services.clock.ClockService;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.applib.services.title.TitleService;
+import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
+import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
+import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
+import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
+
+import static org.apache.causeway.applib.annotation.SemanticsOf.IDEMPOTENT;
+import static org.apache.causeway.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
index 7ce987a..1d27e4d 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="http://isis.apache.org/applib/layout/component" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="http://causeway.apache.org/applib/layout/component" xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index 089e6ad..370137f 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@ -7,17 +7,17 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.jdo.JDOQLTypedQuery;
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.BookmarkPolicy;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.persistence.jdo.applib.services.JdoSupportService;
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.query.Query;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
import lombok.RequiredArgsConstructor;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index 34615ef..930a2ff 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -5,13 +5,13 @@ import java.io.InputStream;
import javax.inject.Inject;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
-import org.apache.isis.testing.fixtures.applib.personas.Persona;
-import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
+import org.apache.causeway.applib.services.clock.ClockService;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.testing.fakedata.applib.services.FakeDataService;
+import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptWithResult;
+import org.apache.causeway.testing.fixtures.applib.personas.Persona;
+import org.apache.causeway.testing.fixtures.applib.setup.PersonaEnumPersistAll;
import org.springframework.core.io.ClassPathResource;
import lombok.*;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java b/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
index 7715f1e..880264b 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
@@ -7,9 +7,9 @@ import java.lang.annotation.Target;
import javax.jdo.annotations.Column;
-import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.applib.annotation.Property;
@Column(length = Name.MAX_LEN, allowsNull = "false")
@Property(maxLength = Name.MAX_LEN)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java b/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
index afd987e..5e8f7b5 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
@@ -7,12 +7,12 @@ import java.lang.annotation.Target;
import javax.jdo.annotations.Column;
-import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Where;
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Where;
@Column(length = Notes.MAX_LEN, allowsNull = "true")
@Property(editing = Editing.ENABLED, maxLength = Notes.MAX_LEN)
diff --git a/pom.xml b/pom.xml
index 9090813..c7d5af4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.app</groupId>
- <artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M9</version>
+ <groupId>org.apache.causeway.app</groupId>
+ <artifactId>causeway-app-starter-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>simpleapp-jdo</artifactId>
- <groupId>org.apache.isis.starters</groupId>
+ <groupId>org.apache.causeway.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
<name>SimpleApp (JDO) - Parent</name>
@@ -94,7 +94,7 @@
<repositories>
<repository>
<id>nightly-builds</id>
- <url>https://raw.githubusercontent.com/apache-isis-committers/isis-nightly/master/mvn-snapshots</url>
+ <url>https://raw.githubusercontent.com/apache-causeway-committers/causeway-nightly/master/mvn-snapshots</url>
</repository>
</repositories>
</profile>
diff --git a/update-parent.sh b/update-parent.sh
index de78ca7..0a4ff97 100644
--- a/update-parent.sh
+++ b/update-parent.sh
@@ -2,14 +2,14 @@
if [ $# = 1 ]; then
PARENT=$1
else
- PARENT=$(curl -X GET "https://nexus.incode.work/service/rest/v1/search?sort=version&repository=nightly-builds&group=org.apache.isis.app&name=isis-app-starter-parent" -H "accept: application/json" -s | jq '.items[0].version' | sed 's/"//g')
+ PARENT=$(curl -X GET "https://nexus.incode.work/service/rest/v1/search?sort=version&repository=nightly-builds&group=org.apache.causeway.app&name=causeway-app-starter-parent" -H "accept: application/json" -s | jq '.items[0].version' | sed 's/"//g')
fi
echo "parentVersion = $PARENT"
mvn versions:update-parent -DparentVersion="[$PARENT]"
-CURR=$(grep "<isis.version>" pom.xml | head -1 | cut -d'>' -f2 | cut -d'<' -f1)
-sed -i "s|<isis.version>$CURR</isis.version>|<isis.version>$PARENT</isis.version>|g" pom.xml
+CURR=$(grep "<causeway.version>" pom.xml | head -1 | cut -d'>' -f2 | cut -d'<' -f1)
+sed -i "s|<causeway.version>$CURR</causeway.version>|<causeway.version>$PARENT</causeway.version>|g" pom.xml
git add pom.xml
git commit -m "updates parent pom to $PARENT"
diff --git a/webapp-tests/log4j2-test.xml b/webapp-tests/log4j2-test.xml
index 60e8974..1f75cd2 100644
--- a/webapp-tests/log4j2-test.xml
+++ b/webapp-tests/log4j2-test.xml
@@ -40,7 +40,7 @@
<AppenderRef ref="Console" />
</Root>
- <logger name="org.apache.isis.core.runtimeservices.i18n.po.PoWriter" level="info">
+ <logger name="org.apache.causeway.core.runtimeservices.i18n.po.PoWriter" level="info">
<AppenderRef ref="TranslationsPoFile"/>
</logger>
@@ -67,4 +67,4 @@
<!-- DataNucleus.JDO - All messages general to JDO -->
<!-- DataNucleus.JPA - All messages general to JPA -->
<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
+<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 83607bb..10d70e7 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>simpleapp-jdo</artifactId>
- <groupId>org.apache.isis.starters</groupId>
+ <groupId>org.apache.causeway.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -43,20 +43,20 @@
<!-- TESTING -->
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fakedata-applib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-fixtures-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 358d896..16fbbe4 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -8,12 +8,12 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
-import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
-import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
import domainapp.modules.simple.SimpleModule;
import domainapp.webapp.application.ApplicationModule;
@@ -26,7 +26,7 @@ import domainapp.webapp.application.ApplicationModule;
}
)
@ActiveProfiles("test")
-public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class WebAppIntegTestAbstract extends CausewayIntegrationTestAbstract {
/**
* Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
@@ -36,17 +36,17 @@ public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstrac
@EnableAutoConfiguration
@Import({
- IsisModuleCoreRuntimeServices.class,
- IsisModuleSecurityBypass.class,
- IsisModulePersistenceJdoDatanucleus.class,
- IsisModuleTestingFixturesApplib.class,
+ CausewayModuleCoreRuntimeServices.class,
+ CausewayModuleSecurityBypass.class,
+ CausewayModulePersistenceJdoDatanucleus.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 {
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
index d2b345d..ffd3674 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
@@ -8,18 +8,18 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.test.annotation.DirtiesContext;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.applib.services.swagger.Format;
-import org.apache.isis.applib.services.swagger.Visibility;
-import org.apache.isis.testing.integtestsupport.applib.swagger.SwaggerExporter;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.applib.services.swagger.Format;
+import org.apache.causeway.applib.services.swagger.Visibility;
+import org.apache.causeway.testing.integtestsupport.applib.swagger.SwaggerExporter;
+import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
import lombok.val;
import domainapp.webapp.integtests.WebAppIntegTestAbstract;
@Import({
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
})
@DirtiesContext
class SwaggerExport_IntegTest extends WebAppIntegTestAbstract {
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
index 84b9b0c..19f7049 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
@@ -4,8 +4,8 @@ import javax.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator;
import domainapp.webapp.integtests.WebAppIntegTestAbstract;
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index f8c5b56..baf4eda 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -4,12 +4,12 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.applib.services.wrapper.InvalidException;
+import org.apache.causeway.applib.services.wrapper.InvalidException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.causeway.applib.services.xactn.TransactionService;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/webapp-tests/src/test/resources/application-test.yml b/webapp-tests/src/test/resources/application-test.yml
index cbf0d20..ad796a2 100644
--- a/webapp-tests/src/test/resources/application-test.yml
+++ b/webapp-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
-isis:
+causeway:
persistence:
schema:
auto-create-schemas: "simple"
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 58606bc..31f806b 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>simpleapp-jdo</artifactId>
- <groupId>org.apache.isis.starters</groupId>
+ <groupId>org.apache.causeway.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -61,89 +61,89 @@
<artifactId>simpleapp-jdo-module-simple</artifactId>
</dependency>
- <!-- isis -->
+ <!-- causeway -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-webapp</artifactId>
+ <groupId>org.apache.causeway.mavendeps</groupId>
+ <artifactId>causeway-mavendeps-webapp</artifactId>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jdo-datanucleus</artifactId>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-applib</artifactId>
+ <groupId>org.apache.causeway.viewer</groupId>
+ <artifactId>causeway-viewer-wicket-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-h2console-ui</artifactId>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing-h2console-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-flyway-impl</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-flyway-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-metamodel</artifactId>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes-asciidoc-metamodel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes-asciidoc-ui-wkt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-exceldownload-wicket-ui</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-exceldownload-wicket-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-fullcalendar-wicket-ui</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-fullcalendar-wicket-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-pdfjs-wicket-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-secman-encryption-jbcrypt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-secman-persistence-jdo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-sessionlog-persistence-jdo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-audittrail-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-audittrail-persistence-jdo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-commandlog-persistence-jdo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-executionlog-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-executionlog-persistence-jdo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-executionoutbox-persistence-jdo</artifactId>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-executionoutbox-persistence-jdo</artifactId>
</dependency>
<dependency>
@@ -241,7 +241,7 @@
</ports>
</container>
<to>
- <image>docker.io/apacheisis/simpleapp</image>
+ <image>docker.io/apachecauseway/simpleapp</image>
<tags>
<tag>${env.REVISION}</tag>
</tags>
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index c037fba..e773816 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -5,30 +5,30 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.applib.IsisModuleApplibChangeAndExecutionLoggers;
-import org.apache.isis.applib.IsisModuleApplibMixins;
-import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.extensions.audittrail.jdo.IsisModuleExtAuditTrailPersistenceJdo;
-import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogPersistenceJdo;
-import org.apache.isis.extensions.executionlog.jdo.IsisModuleExtExecutionLogPersistenceJdo;
-import org.apache.isis.extensions.executionoutbox.jdo.IsisModuleExtExecutionOutboxPersistenceJdo;
-import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
-import org.apache.isis.extensions.fullcalendar.wkt.viewer.IsisModuleExtFullCalendarWicketUi;
-import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsWicketUi;
-import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
-import org.apache.isis.extensions.sessionlog.jdo.IsisModuleExtSessionLogPersistenceJdo;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
-import org.apache.isis.extensions.viewer.wicket.exceldownload.ui.IsisModuleExtExcelDownloadWicketUi;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleusMixins;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
-import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
-import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
-import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
-import org.apache.isis.viewer.wicket.applib.IsisModuleViewerWicketApplibMixins;
-import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
+import org.apache.causeway.applib.CausewayModuleApplibChangeAndExecutionLoggers;
+import org.apache.causeway.applib.CausewayModuleApplibMixins;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
+import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
+import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
+import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecutionOutboxPersistenceJdo;
+import org.apache.causeway.extensions.flyway.impl.CausewayModuleExtFlywayImpl;
+import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CausewayModuleExtFullCalendarWicketUi;
+import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi;
+import org.apache.causeway.extensions.secman.encryption.jbcrypt.CausewayModuleExtSecmanEncryptionJbcrypt;
+import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
+import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
+import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
+import org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
+import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleusMixins;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
+import org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel;
+import org.apache.causeway.valuetypes.asciidoc.ui.wkt.CausewayModuleValAsciidocUiWkt;
+import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
+import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
@@ -37,35 +37,35 @@ import domainapp.webapp.quartz.QuartzModule;
@Configuration
@Import({
- IsisModuleApplibMixins.class,
- IsisModuleApplibChangeAndExecutionLoggers.class,
+ CausewayModuleApplibMixins.class,
+ CausewayModuleApplibChangeAndExecutionLoggers.class,
- IsisModuleCoreRuntimeServices.class,
- IsisModulePersistenceJdoDatanucleus.class,
- IsisModulePersistenceJdoDatanucleusMixins.class,
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
- IsisModuleViewerWicketApplibMixins.class,
- IsisModuleViewerWicketViewer.class,
+ CausewayModuleCoreRuntimeServices.class,
+ CausewayModulePersistenceJdoDatanucleus.class,
+ CausewayModulePersistenceJdoDatanucleusMixins.class,
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ CausewayModuleViewerWicketApplibMixins.class,
+ CausewayModuleViewerWicketViewer.class,
- IsisModuleTestingFixturesApplib.class,
- IsisModuleTestingH2ConsoleUi.class,
+ CausewayModuleTestingFixturesApplib.class,
+ CausewayModuleTestingH2ConsoleUi.class,
- IsisModuleExtFlywayImpl.class,
+ CausewayModuleExtFlywayImpl.class,
- IsisModuleExtSecmanPersistenceJdo.class,
- IsisModuleExtSecmanEncryptionJbcrypt.class,
- IsisModuleExtSessionLogPersistenceJdo.class,
- IsisModuleExtAuditTrailPersistenceJdo.class,
- IsisModuleExtCommandLogPersistenceJdo.class,
- IsisModuleExtExecutionLogPersistenceJdo.class,
- IsisModuleExtExecutionOutboxPersistenceJdo.class,
+ CausewayModuleExtSecmanPersistenceJdo.class,
+ CausewayModuleExtSecmanEncryptionJbcrypt.class,
+ CausewayModuleExtSessionLogPersistenceJdo.class,
+ CausewayModuleExtAuditTrailPersistenceJdo.class,
+ CausewayModuleExtCommandLogPersistenceJdo.class,
+ CausewayModuleExtExecutionLogPersistenceJdo.class,
+ CausewayModuleExtExecutionOutboxPersistenceJdo.class,
- IsisModuleExtExcelDownloadWicketUi.class,
- IsisModuleExtFullCalendarWicketUi.class,
- IsisModuleExtPdfjsWicketUi.class,
+ CausewayModuleExtExcelDownloadWicketUi.class,
+ CausewayModuleExtFullCalendarWicketUi.class,
+ CausewayModuleExtPdfjsWicketUi.class,
- IsisModuleValAsciidocMetaModel.class, // for pretty rendering of DTO objects such as CommandDto, InteractionDto
- IsisModuleValAsciidocUiWkt.class,
+ CausewayModuleValAsciidocMetaModel.class, // for pretty rendering of DTO objects such as CommandDto, InteractionDto
+ CausewayModuleValAsciidocUiWkt.class,
ApplicationModule.class,
CustomModule.class,
@@ -75,7 +75,7 @@ import domainapp.webapp.quartz.QuartzModule;
DomainAppDemo.class
})
@PropertySources({
- @PropertySource(IsisPresets.DebugDiscovery),
+ @PropertySource(CausewayPresets.DebugDiscovery),
})
public class AppManifest {
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 7dedb13..3e5cdb0 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootApplication
@Import({
@@ -19,7 +19,7 @@ public class SimpleApp extends SpringBootServletInitializer {
* entry point by searching for classes having a {@code main(...)}
*/
public static void main(String[] args) {
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
SpringApplication.run(new Class[] { SimpleApp.class }, args);
}
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 3b18a98..28b603f 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -2,8 +2,8 @@ package domainapp.webapp.application.fixture.scenarios;
import javax.inject.Inject;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
import domainapp.modules.simple.fixture.SimpleObject_persona;
diff --git a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java
index 83b21b0..da6cd6a 100644
--- a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java
+++ b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java
@@ -4,15 +4,15 @@ import java.util.function.Supplier;
import javax.inject.Inject;
-import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
-import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
-import org.apache.isis.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.isis.extensions.secman.applib.user.dom.AccountType;
-import org.apache.isis.extensions.secman.applib.user.fixtures.AbstractUserAndRolesFixtureScript;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
+import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
+import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
+import org.apache.causeway.extensions.secman.applib.user.fixtures.AbstractUserAndRolesFixtureScript;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
public class CustomRolesAndUsers extends FixtureScript {
@@ -50,11 +50,11 @@ public class CustomRolesAndUsers extends FixtureScript {
@Override
public Can<String> get() {
return Can.of(
- isisConfiguration.getExtensions().getSecman().getSeed().getRegularUser().getRoleName(), // built-in stuff
+ causewayConfiguration.getExtensions().getSecman().getSeed().getRegularUser().getRoleName(), // built-in stuff
SimpleModuleSuperuserRole.ROLE_NAME
);
}
- @Inject IsisConfiguration isisConfiguration;
+ @Inject CausewayConfiguration causewayConfiguration;
}
}
diff --git a/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java b/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java
index f94898d..24c0aa0 100644
--- a/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java
+++ b/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java
@@ -6,12 +6,12 @@ import javax.inject.Inject;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.events.metamodel.MetamodelEvent;
-import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.environment.IsisSystemEnvironment;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.events.metamodel.MetamodelEvent;
+import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.RequiredArgsConstructor;
@@ -22,11 +22,11 @@ public class SeedSecurityService {
private final FixtureScripts fixtureScripts;
private final TransactionService transactionService;
- private final IsisSystemEnvironment isisSystemEnvironment;
+ private final CausewaySystemEnvironment causewaySystemEnvironment;
@EventListener(MetamodelEvent.class)
public void onMetamodelEvent(final MetamodelEvent event) {
- if (event.isPostMetamodel() && isisSystemEnvironment.isPrototyping()) {
+ if (event.isPostMetamodel() && causewaySystemEnvironment.isPrototyping()) {
runScripts();
transactionService.flushTransaction();
}
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 4f16352..9d503f7 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -5,8 +5,8 @@ import javax.inject.Named;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.services.health.Health;
-import org.apache.isis.applib.services.health.HealthCheckService;
+import org.apache.causeway.applib.services.health.Health;
+import org.apache.causeway.applib.services.health.HealthCheckService;
import domainapp.modules.simple.dom.so.SimpleObjects;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index ad26686..8aeb9e4 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -5,16 +5,16 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.applib.annotation.Domain;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.HomePage;
-import org.apache.isis.applib.annotation.MemberSupport;
-import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.ObjectSupport;
-import org.apache.isis.applib.annotation.TableDecoration;
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.HomePage;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.TableDecoration;
import domainapp.modules.simple.SimpleModule;
import domainapp.modules.simple.dom.so.SimpleObject;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
index 72ba56e..43e6771 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns="http://isis.apache.org/applib/layout/component" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns="http://causeway.apache.org/applib/layout/component" xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="3">
<bs3:row>
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index 2f0e7e8..1e02e73 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -10,10 +10,10 @@ import javax.inject.Inject;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.apache.isis.applib.services.iactnlayer.InteractionContext;
-import org.apache.isis.applib.services.iactnlayer.InteractionService;
-import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.applib.services.xactn.TransactionalProcessor;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.applib.services.xactn.TransactionalProcessor;
import lombok.RequiredArgsConstructor;
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index 6497693..47ea4e8 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -12,10 +12,10 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.services.iactnlayer.InteractionContext;
-import org.apache.isis.applib.services.iactnlayer.InteractionService;
-import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.applib.services.xactn.TransactionalProcessor;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.applib.services.xactn.TransactionalProcessor;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 282b297..7ae065b 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -3,7 +3,7 @@
#
# See also config/application.properties
#
-isis:
+causeway:
applib:
annotation:
@@ -50,12 +50,12 @@ isis:
admin:
user-name: "secman-admin"
password: "pass"
- role-name: "isis-ext-secman-admin"
+ role-name: "causeway-ext-secman-admin"
namespace-permissions:
sticky: "simple"
# additional: ...
regular-user:
- role-name: "isis-ext-secman-user"
+ role-name: "causeway-ext-secman-user"
permissions-evaluation-policy: allow_beats_veto
user-menu-me-action-policy: hide
@@ -63,7 +63,7 @@ isis:
wicket:
application:
about: Simple App
- brand-logo-header: images/apache-isis/logo-48x48.png
+ brand-logo-header: images/apache-causeway/logo-48x48.png
css: css/application.css
favicon-url: images/favicon.png
js: scripts/application.js
@@ -73,9 +73,9 @@ isis:
version: @project.version@
credit:
- - url: http://isis.apache.org
- image: images/apache-isis/logo-48x48.png
- name: Apache Isis
+ - url: http://causeway.apache.org
+ image: images/apache-causeway/logo-48x48.png
+ name: Apache Causeway
bookmarked-pages:
show-chooser: true
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index 026330e..64bf5d1 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -25,8 +25,8 @@ spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
spring.datasource.username=simpleapp
spring.datasource.password=simpleapp
-#isis.persistence.schema.create-schema-sql-template= (use flyway instead)
-isis.persistence.schema.auto-create-schemas=
+#causeway.persistence.schema.create-schema-sql-template= (use flyway instead)
+causeway.persistence.schema.auto-create-schemas=
# DataNucleus, and must use camelCase rather than kebab-case
datanucleus.schema.autoCreateAll=false
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 0ae80c2..c3a7680 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -14,16 +14,16 @@ spring.sql.init.platform=h2
spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false;IGNORECASE=TRUE
spring.datasource.driver-class-name=org.h2.Driver
-isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
-isis.persistence.schema.auto-create-schemas=simple,isisExtSecman,isisExtAuditTrail,isisExtCommandLog,isisExtExecutionLog,isisExtExecutionOutbox,isisExtSessionLog
+causeway.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
+causeway.persistence.schema.auto-create-schemas=simple,causewayExtSecman,causewayExtAuditTrail,causewayExtCommandLog,causewayExtExecutionLog,causewayExtExecutionOutbox,causewayExtSessionLog
-isis.core.meta-model.introspector.policy=encapsulation_enabled
+causeway.core.meta-model.introspector.policy=encapsulation_enabled
datanucleus.schema.generate-database.mode=create
# uncomment to run during bootstrap
-#isis.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+#causeway.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo
# Register P6LogFactory to log JDBC events
diff --git a/webapp/src/main/resources/log4j2-spring.xml b/webapp/src/main/resources/log4j2-spring.xml
index fa5582e..acb108d 100644
--- a/webapp/src/main/resources/log4j2-spring.xml
+++ b/webapp/src/main/resources/log4j2-spring.xml
@@ -18,10 +18,10 @@
<!-- silence Wicket -->
<Logger name="org.apache.wicket.page.PartialPageUpdate" level="error" />
- <Logger name="org.apache.isis.applib.services.publishing.log.CommandLogger" level="debug" />
- <Logger name="org.apache.isis.applib.services.publishing.log.ExecutionLogger" level="debug" />
- <Logger name="org.apache.isis.applib.services.publishing.log.EntityChangesLogger" level="debug" />
- <Logger name="org.apache.isis.applib.services.publishing.log.EntityPropertyChangeLogger" level="debug" />
+ <Logger name="org.apache.causeway.applib.services.publishing.log.CommandLogger" level="debug" />
+ <Logger name="org.apache.causeway.applib.services.publishing.log.ExecutionLogger" level="debug" />
+ <Logger name="org.apache.causeway.applib.services.publishing.log.EntityChangesLogger" level="debug" />
+ <Logger name="org.apache.causeway.applib.services.publishing.log.EntityPropertyChangeLogger" level="debug" />
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
@@ -40,22 +40,22 @@
<logger name="DataNucleus.Datastore.Schema" level="info"/>
<logger name="DataNucleus.Datastore.Native" level="info"/>
- <logger name="org.apache.isis.applib.services.publishing.log.CommandLogger" level="debug"/>
- <logger name="org.apache.isis.applib.services.publishing.log.EntityChangesLogger" level="debug"/>
- <logger name="org.apache.isis.applib.services.publishing.log.EntityPropertyChangeLogger" level="debug"/>
- <logger name="org.apache.isis.applib.services.publishing.log.ExecutionLogger" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.publishing.log.CommandLogger" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.publishing.log.EntityChangesLogger" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.publishing.log.EntityPropertyChangeLogger" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.publishing.log.ExecutionLogger" level="debug"/>
<!-- request scoped -->
- <logger name="org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest" level="debug"/>
- <logger name="org.apache.isis.applib.services.command.CommandContext" level="debug"/>
- <logger name="org.apache.isis.applib.services.iactn.InteractionProvider" level="debug"/>
- <logger name="org.apache.isis.applib.services.scratchpad.Scratchpad" level="debug"/>
- <logger name="org.apache.isis.core.runtimeservices.publish.PublisherDispatchServiceDefault" level="debug"/>
+ <logger name="org.apache.causeway.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.command.CommandContext" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.iactn.InteractionProvider" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.scratchpad.Scratchpad" level="debug"/>
+ <logger name="org.apache.causeway.core.runtimeservices.publish.PublisherDispatchServiceDefault" level="debug"/>
<!-- transaction scoped -->
- <logger name="org.apache.isis.core.transaction.changetracking.EntityChangeTrackerDefault" level="debug"/>
- <logger name="org.apache.isis.core.runtimeservices.publish.ExecutionPublisherDefault" level="debug"/>
- <logger name="org.apache.isis.applib.services.queryresultscache.QueryResultsCache" level="debug"/>
+ <logger name="org.apache.causeway.core.transaction.changetracking.EntityChangeTrackerDefault" level="debug"/>
+ <logger name="org.apache.causeway.core.runtimeservices.publish.ExecutionPublisherDefault" level="debug"/>
+ <logger name="org.apache.causeway.applib.services.queryresultscache.QueryResultsCache" level="debug"/>
<Root level="info">
<AppenderRef ref="Console" />
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index 6ffb468..d3e5073 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mb3:menuBars xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:mb3="h [...]
+<mb3:menuBars xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/links http://causeway.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://causeway.apache.org/applib/layout/component" xmlns:lnk="http://causeway.apache.org/a [...]
<mb3:primary>
<mb3:menu>
<mb3:named>Simple Objects</mb3:named>
@@ -18,47 +18,47 @@
<mb3:named>Prototyping</mb3:named>
<mb3:section>
<mb3:named>Fixtures</mb3:named>
- <mb3:serviceAction objectType="isis.testing.fixtures.FixtureScripts" id="runFixtureScript"/>
- <mb3:serviceAction objectType="isis.testing.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst"/>
+ <mb3:serviceAction objectType="causeway.testing.fixtures.FixtureScripts" id="runFixtureScript"/>
+ <mb3:serviceAction objectType="causeway.testing.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst"/>
</mb3:section>
<mb3:section>
<mb3:named>Layouts</mb3:named>
- <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts"/>
- <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout"/>
+ <mb3:serviceAction objectType="causeway.applib.LayoutServiceMenu" id="downloadLayouts"/>
+ <mb3:serviceAction objectType="causeway.applib.LayoutServiceMenu" id="downloadMenuBarsLayout"/>
</mb3:section>
<mb3:section>
<mb3:named>Meta Model and Features</mb3:named>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelXml"/>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelCsv"/>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelAscii"/>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelDiff"/>
- <mb3:serviceAction objectType="isis.feat.ApplicationFeatureMenu" id="allNamespaces"/>
- <mb3:serviceAction objectType="isis.feat.ApplicationFeatureMenu" id="allTypes"/>
- <mb3:serviceAction objectType="isis.feat.ApplicationFeatureMenu" id="allActions"/>
- <mb3:serviceAction objectType="isis.feat.ApplicationFeatureMenu" id="allProperties"/>
- <mb3:serviceAction objectType="isis.feat.ApplicationFeatureMenu" id="allCollections"/>
+ <mb3:serviceAction objectType="causeway.applib.MetaModelServiceMenu" id="downloadMetaModelXml"/>
+ <mb3:serviceAction objectType="causeway.applib.MetaModelServiceMenu" id="downloadMetaModelCsv"/>
+ <mb3:serviceAction objectType="causeway.applib.MetaModelServiceMenu" id="downloadMetaModelAscii"/>
+ <mb3:serviceAction objectType="causeway.applib.MetaModelServiceMenu" id="downloadMetaModelDiff"/>
+ <mb3:serviceAction objectType="causeway.feat.ApplicationFeatureMenu" id="allNamespaces"/>
+ <mb3:serviceAction objectType="causeway.feat.ApplicationFeatureMenu" id="allTypes"/>
+ <mb3:serviceAction objectType="causeway.feat.ApplicationFeatureMenu" id="allActions"/>
+ <mb3:serviceAction objectType="causeway.feat.ApplicationFeatureMenu" id="allProperties"/>
+ <mb3:serviceAction objectType="causeway.feat.ApplicationFeatureMenu" id="allCollections"/>
</mb3:section>
<mb3:section>
<mb3:named>Persistence</mb3:named>
- <mb3:serviceAction objectType="isis.persistence.jdo.JdoMetamodelMenu" id="downloadMetamodels"/>
- <mb3:serviceAction objectType="isis.ext.h2Console.H2ManagerMenu" id="openH2Console"/>
+ <mb3:serviceAction objectType="causeway.persistence.jdo.JdoMetamodelMenu" id="downloadMetamodels"/>
+ <mb3:serviceAction objectType="causeway.ext.h2Console.H2ManagerMenu" id="openH2Console"/>
</mb3:section>
<mb3:section>
<mb3:named>REST API</mb3:named>
- <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="openSwaggerUi"/>
- <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="openRestApi"/>
- <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition"/>
+ <mb3:serviceAction objectType="causeway.viewer.restfulobjects.SwaggerServiceMenu" id="openSwaggerUi"/>
+ <mb3:serviceAction objectType="causeway.viewer.restfulobjects.SwaggerServiceMenu" id="openRestApi"/>
+ <mb3:serviceAction objectType="causeway.viewer.restfulobjects.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition"/>
</mb3:section>
<mb3:section>
<mb3:named>i18n</mb3:named>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="downloadTranslations"/>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="resetTranslationCache"/>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToReadingTranslations"/>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations"/>
+ <mb3:serviceAction objectType="causeway.applib.TranslationServicePoMenu" id="downloadTranslations"/>
+ <mb3:serviceAction objectType="causeway.applib.TranslationServicePoMenu" id="resetTranslationCache"/>
+ <mb3:serviceAction objectType="causeway.applib.TranslationServicePoMenu" id="switchToReadingTranslations"/>
+ <mb3:serviceAction objectType="causeway.applib.TranslationServicePoMenu" id="switchToWritingTranslations"/>
</mb3:section>
<mb3:section>
<mb3:named>Manual Testing</mb3:named>
- <mb3:serviceAction id="downloadSitemap" objectType="isis.applib.SitemapServiceMenu">
+ <mb3:serviceAction id="downloadSitemap" objectType="causeway.applib.SitemapServiceMenu">
<cpt:named>Download Site-Map Template (Adoc)</cpt:named>
</mb3:serviceAction>
</mb3:section>
@@ -67,55 +67,55 @@
<mb3:named>Activity</mb3:named>
<mb3:section>
<mb3:named>Sessions</mb3:named>
- <mb3:serviceAction id="activeSessions" objectType="isis.ext.sessionLog.SessionLogMenu"/>
- <mb3:serviceAction id="findSessions" objectType="isis.ext.sessionLog.SessionLogMenu"/>
+ <mb3:serviceAction id="activeSessions" objectType="causeway.ext.sessionLog.SessionLogMenu"/>
+ <mb3:serviceAction id="findSessions" objectType="causeway.ext.sessionLog.SessionLogMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Commands</mb3:named>
- <mb3:serviceAction id="activeCommands" objectType="isis.ext.commandLog.CommandLogMenu"/>
- <mb3:serviceAction id="findMostRecent" objectType="isis.ext.commandLog.CommandLogMenu"/>
- <mb3:serviceAction id="findCommands" objectType="isis.ext.commandLog.CommandLogMenu"/>
- <mb3:serviceAction id="findAll" objectType="isis.ext.commandLog.CommandLogMenu"/>
+ <mb3:serviceAction id="activeCommands" objectType="causeway.ext.commandLog.CommandLogMenu"/>
+ <mb3:serviceAction id="findMostRecent" objectType="causeway.ext.commandLog.CommandLogMenu"/>
+ <mb3:serviceAction id="findCommands" objectType="causeway.ext.commandLog.CommandLogMenu"/>
+ <mb3:serviceAction id="findAll" objectType="causeway.ext.commandLog.CommandLogMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Execution Log</mb3:named>
- <mb3:serviceAction id="findMostRecent" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
- <mb3:serviceAction id="findExecutions" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
- <mb3:serviceAction id="findAll" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
+ <mb3:serviceAction id="findMostRecent" objectType="causeway.ext.executionLog.ExecutionLogMenu"/>
+ <mb3:serviceAction id="findExecutions" objectType="causeway.ext.executionLog.ExecutionLogMenu"/>
+ <mb3:serviceAction id="findAll" objectType="causeway.ext.executionLog.ExecutionLogMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Audit Trail</mb3:named>
- <mb3:serviceAction id="findMostRecent" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
- <mb3:serviceAction id="findAuditEntries" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
- <mb3:serviceAction id="findAll" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findMostRecent" objectType="causeway.ext.auditTrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findAuditEntries" objectType="causeway.ext.auditTrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findAll" objectType="causeway.ext.auditTrail.AuditTrailMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Execution Outbox</mb3:named>
- <mb3:serviceAction id="findOldest" objectType="isis.ext.executionOutbox.ExecutionOutboxMenu"/>
- <mb3:serviceAction id="findAll" objectType="isis.ext.executionOutbox.ExecutionOutboxMenu"/>
+ <mb3:serviceAction id="findOldest" objectType="causeway.ext.executionOutbox.ExecutionOutboxMenu"/>
+ <mb3:serviceAction id="findAll" objectType="causeway.ext.executionOutbox.ExecutionOutboxMenu"/>
</mb3:section>
</mb3:menu>
<mb3:menu>
<mb3:named>Security</mb3:named>
<mb3:section>
<mb3:named>Users</mb3:named>
- <mb3:serviceAction id="userManager" objectType="isis.ext.secman.ApplicationUserMenu"/>
- <mb3:serviceAction id="findUsers" objectType="isis.ext.secman.ApplicationUserMenu"/>
+ <mb3:serviceAction id="userManager" objectType="causeway.ext.secman.ApplicationUserMenu"/>
+ <mb3:serviceAction id="findUsers" objectType="causeway.ext.secman.ApplicationUserMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Roles</mb3:named>
- <mb3:serviceAction id="roleManager" objectType="isis.ext.secman.ApplicationRoleMenu"/>
- <mb3:serviceAction id="findRoles" objectType="isis.ext.secman.ApplicationRoleMenu"/>
+ <mb3:serviceAction id="roleManager" objectType="causeway.ext.secman.ApplicationRoleMenu"/>
+ <mb3:serviceAction id="findRoles" objectType="causeway.ext.secman.ApplicationRoleMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Permissions</mb3:named>
- <mb3:serviceAction id="allPermissions" objectType="isis.ext.secman.ApplicationPermissionMenu"/>
- <mb3:serviceAction id="findOrphanedPermissions" objectType="isis.ext.secman.ApplicationPermissionMenu"/>
+ <mb3:serviceAction id="allPermissions" objectType="causeway.ext.secman.ApplicationPermissionMenu"/>
+ <mb3:serviceAction id="findOrphanedPermissions" objectType="causeway.ext.secman.ApplicationPermissionMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Tenancies</mb3:named>
- <mb3:serviceAction id="tenancyManager" objectType="isis.ext.secman.ApplicationTenancyMenu"/>
- <mb3:serviceAction id="findTenancies" objectType="isis.ext.secman.ApplicationTenancyMenu"/>
+ <mb3:serviceAction id="tenancyManager" objectType="causeway.ext.secman.ApplicationTenancyMenu"/>
+ <mb3:serviceAction id="findTenancies" objectType="causeway.ext.secman.ApplicationTenancyMenu"/>
</mb3:section>
</mb3:menu>
</mb3:secondary>
@@ -124,19 +124,19 @@
<mb3:named/>
<mb3:section>
<mb3:named>Configuration</mb3:named>
- <mb3:serviceAction objectType="isis.conf.ConfigurationMenu" id="configuration"/>
+ <mb3:serviceAction objectType="causeway.conf.ConfigurationMenu" id="configuration"/>
</mb3:section>
<mb3:section>
<mb3:named>Impersonate</mb3:named>
- <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonate"/>
- <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonateWithRoles"/>
- <mb3:serviceAction objectType="isis.applib.ImpersonateStopMenu" id="stopImpersonating"/>
+ <mb3:serviceAction objectType="causeway.sudo.ImpersonateMenu" id="impersonate"/>
+ <mb3:serviceAction objectType="causeway.sudo.ImpersonateMenu" id="impersonateWithRoles"/>
+ <mb3:serviceAction objectType="causeway.applib.ImpersonateStopMenu" id="stopImpersonating"/>
</mb3:section>
<mb3:section>
<mb3:named>Security</mb3:named>
- <mb3:serviceAction objectType="isis.applib.UserMenu" id="me"/> <!-- this is hidden by secman -->
- <mb3:serviceAction objectType="isis.ext.secman.MeService" id="me"/>
- <mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout"/>
+ <mb3:serviceAction objectType="causeway.applib.UserMenu" id="me"/> <!-- this is hidden by secman -->
+ <mb3:serviceAction objectType="causeway.ext.secman.MeService" id="me"/>
+ <mb3:serviceAction objectType="causeway.security.LogoutMenu" id="logout"/>
</mb3:section>
</mb3:menu>
</mb3:tertiary>
diff --git a/webapp/src/main/resources/shiro.ini b/webapp/src/main/resources/shiro.ini
index 59e43ba..11af16a 100644
--- a/webapp/src/main/resources/shiro.ini
+++ b/webapp/src/main/resources/shiro.ini
@@ -41,13 +41,13 @@ guest_role = *:SimpleObjects:findByName:*,\
*:SimpleObjects:listAll:*,\
*:SimpleObjects:*:r
admin_role = *
-default_role = isis.applib,\
- isis.security
-fixtures_role = isis.testing.fixtures
-features_role = isis.feat
-metamodel_role = isis.metamodel
-h2_role = isis.ext.h2Console
-jdo_role = isis.persistence.jdo
-swagger_role = isis.viewer.restfulobjects
-conf_role = isis.conf
-sudo_role = isis.sudo
+default_role = causeway.applib,\
+ causeway.security
+fixtures_role = causeway.testing.fixtures
+features_role = causeway.feat
+metamodel_role = causeway.metamodel
+h2_role = causeway.ext.h2Console
+jdo_role = causeway.persistence.jdo
+swagger_role = causeway.viewer.restfulobjects
+conf_role = causeway.conf
+sudo_role = causeway.sudo
diff --git a/webapp/src/main/resources/static/images/apache-isis/logo-48x48.png b/webapp/src/main/resources/static/images/apache-causeway/logo-48x48.png
similarity index 100%
rename from webapp/src/main/resources/static/images/apache-isis/logo-48x48.png
rename to webapp/src/main/resources/static/images/apache-causeway/logo-48x48.png
diff --git a/webapp/src/main/resources/static/images/apache-isis/logo.png b/webapp/src/main/resources/static/images/apache-causeway/logo.png
similarity index 100%
rename from webapp/src/main/resources/static/images/apache-isis/logo.png
rename to webapp/src/main/resources/static/images/apache-causeway/logo.png
diff --git a/webapp/src/main/resources/static/index.html b/webapp/src/main/resources/static/index.html
index a7f42f3..f328ccd 100644
--- a/webapp/src/main/resources/static/index.html
+++ b/webapp/src/main/resources/static/index.html
@@ -2,16 +2,16 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>Apache Isis™ Simple App</title>
+ <title>Apache Causeway™ Simple App</title>
<link rel="stylesheet" type="text/css" href="css/page.css">
</head>
<body>
<div id="wrapper">
- <img alt="Isis Logo" src="images/apache-isis/logo.png" />
+ <img alt="Causeway Logo" src="images/apache-causeway/logo.png" />
<p>
- This is a simple <a href="http://isis.apache.org">Apache Isis</a> application, structured so it can be
+ This is a simple <a href="http://causeway.apache.org">Apache Causeway</a> application, structured so it can be
used as a starting point for developing your own applications.
<br/>
</p>
diff --git a/webapp/src/main/resources/templates/error.html b/webapp/src/main/resources/templates/error.html
index f9d0a41..6b6c31a 100644
--- a/webapp/src/main/resources/templates/error.html
+++ b/webapp/src/main/resources/templates/error.html
@@ -2,13 +2,13 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>Apache Isis™ Simple App</title>
+ <title>Apache Causeway™ Simple App</title>
<link rel="stylesheet" type="text/css" th:href="@{/css/page.css}">
</head>
<body>
<div id="wrapper">
- <img alt="Isis Logo" th:src="@{/images/apache-isis/logo.png}" />
+ <img alt="Causeway Logo" th:src="@{/images/apache-causeway/logo.png}" />
<p>
Our apologies - an error occurred.