This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch v4-jpa in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
commit cc8044bec97bdad46ac7e9421ee765b0514844bd Author: Dan Haywood <[email protected]> AuthorDate: Wed Oct 8 23:55:48 2025 +0100 updates to 4.0.0-SNAPSHOT --- module-simple-tests/pom.xml | 2 +- .../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 1 - module-simple/pom.xml | 2 +- .../src/main/java/domainapp/modules/simple/SimpleModule.java | 2 +- pom.xml | 4 ++-- webapp-tests/pom.xml | 2 +- .../java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java | 1 - .../webapp/integtests/metamodel/SwaggerExport_IntegTest.java | 5 +++-- webapp/pom.xml | 4 ++-- webapp/src/main/java/domainapp/webapp/AppManifest.java | 6 +++--- .../domainapp/webapp/application/seed/CustomRolesAndUsers.java | 2 +- webapp/src/main/resources/application.yml | 8 +++----- 12 files changed, 18 insertions(+), 21 deletions(-) diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml index fe08618..e6ae68e 100644 --- a/module-simple-tests/pom.xml +++ b/module-simple-tests/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>simpleapp-jpa</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>simpleapp-jpa-module-simple-tests</artifactId> 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 2b7b66d..98dce70 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 @@ -41,7 +41,6 @@ public abstract class SimpleModuleIntegTestAbstract extends CausewayIntegrationT }) @PropertySources({ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), - @PropertySource(CausewayPresets.UseLog4j2Test), }) public static class TestApp { diff --git a/module-simple/pom.xml b/module-simple/pom.xml index afbca77..2d611c2 100644 --- a/module-simple/pom.xml +++ b/module-simple/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>simpleapp-jpa</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>simpleapp-jpa-module-simple</artifactId> 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 49aaf5b..4f4f865 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java +++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java @@ -1,6 +1,6 @@ package domainapp.modules.simple; -import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/pom.xml b/pom.xml index 7ff9f9b..90cb297 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.apache.causeway.app</groupId> <artifactId>causeway-app-starter-parent</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <relativePath/> </parent> <artifactId>simpleapp-jpa</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <name>SimpleApp (JPA) - Parent</name> diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml index 6904edf..47c4178 100644 --- a/webapp-tests/pom.xml +++ b/webapp-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>simpleapp-jpa</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>simpleapp-jpa-webapp-tests</artifactId> 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 b131dc4..6c02036 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java @@ -47,7 +47,6 @@ public abstract class WebAppIntegTestAbstract extends CausewayIntegrationTestAbs }) @PropertySources({ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), - @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 7c9e648..97f1b41 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 @@ -4,6 +4,8 @@ import jakarta.inject.Inject; +import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; + import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -13,14 +15,13 @@ 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.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; import lombok.val; import domainapp.webapp.integtests.WebAppIntegTestAbstract; @Import({ - CausewayModuleViewerRestfulObjectsJaxrsResteasy.class + CausewayModuleViewerRestfulObjectsViewer.class, }) @DirtiesContext class SwaggerExport_IntegTest extends WebAppIntegTestAbstract { diff --git a/webapp/pom.xml b/webapp/pom.xml index d813504..2289fae 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>simpleapp-jpa</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.5.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>simpleapp-jpa-webapp</artifactId> @@ -104,7 +104,7 @@ </dependency> <dependency> <groupId>org.apache.causeway.viewer</groupId> - <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId> + <artifactId>causeway-viewer-restfulobjects-viewer</artifactId> </dependency> <dependency> diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java index 28db580..65a7574 100644 --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@ -1,11 +1,12 @@ package domainapp.webapp; -import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi; import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub; import org.apache.causeway.viewer.graphql.viewer.CausewayModuleViewerGraphqlViewer; +import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; @@ -31,7 +32,6 @@ 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.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; @@ -50,7 +50,7 @@ CausewayModuleCoreRuntimeServices.class, CausewayModulePersistenceJpaEclipselink.class, - CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, + CausewayModuleViewerRestfulObjectsViewer.class, CausewayModuleViewerWicketViewer.class, CausewayModuleViewerGraphqlViewer.class, 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 be4333e..bf599cd 100644 --- a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java +++ b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java @@ -50,7 +50,7 @@ private static class RoleSupplier implements Supplier<Can<String>> { @Override public Can<String> get() { return Can.of( - causewayConfiguration.getExtensions().getSecman().getSeed().getRegularUser().getRoleName(), // built-in stuff + causewayConfiguration.extensions().secman().seed().regularUser().roleName(), // built-in stuff SimpleModuleSuperuserRole.ROLE_NAME ); } diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml index dae0fb4..27a83b7 100644 --- a/webapp/src/main/resources/application.yml +++ b/webapp/src/main/resources/application.yml @@ -107,6 +107,9 @@ causeway: - simple-superuser - foo - bar + restfulobjects: + basePath: /restful + testing: fixtures: @@ -128,11 +131,6 @@ eclipselink: # properties using application.properties instead (it's not possible to # specify both eclipselink.weaving property and its subproperties using yaml syntax) -resteasy: - jaxrs: - app: - registration: beans - defaultPath: "/restful" server: max-http-header-size: 16KB
