This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 5fca57d936 CAUSEWAY-3411: [Demo] demo domain should not depend on
wicket
5fca57d936 is described below
commit 5fca57d936a1cd61cfe4ed314c1fffefdb93c53c
Author: Andi Huber <[email protected]>
AuthorDate: Sat Apr 8 09:03:26 2023 +0200
CAUSEWAY-3411: [Demo] demo domain should not depend on wicket
---
examples/demo/domain/pom.xml | 5 -----
.../DomainObjectNatureViewModel_updateMessage.java | 19 ++++---------------
.../main/java/demoapp/web/DemoAppManifestCommon.java | 3 +--
examples/demo/wicket/common/pom.xml | 6 +++++-
.../webapp/wicket/common/ui/DemoAppWicketCommon.java | 2 ++
5 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/examples/demo/domain/pom.xml b/examples/demo/domain/pom.xml
index b1e141b99e..255a8cd621 100644
--- a/examples/demo/domain/pom.xml
+++ b/examples/demo/domain/pom.xml
@@ -58,11 +58,6 @@
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-pdfjs-applib</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
-
<artifactId>causeway-extensions-exceldownload-wicket-ui</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-secman-integration</artifactId>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel_updateMessage.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel_updateMessage.java
index 243ac5d20b..09ba685f0d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel_updateMessage.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel_updateMessage.java
@@ -1,20 +1,10 @@
package demoapp.dom.domain.objects.DomainObject.nature.viewmodel;
-import demoapp.dom._infra.values.ValueHolderRepository;
-import demoapp.dom.domain.objects.DomainObject.nature.DomainObjectNaturePage;
-import
demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
-import lombok.RequiredArgsConstructor;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
+import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.Collection;
-import org.apache.causeway.applib.annotation.CollectionLayout;
-import org.apache.causeway.applib.annotation.DomainObject;
+
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action()
@@ -22,11 +12,10 @@ import org.apache.causeway.applib.annotation.DomainObject;
public class DomainObjectNatureViewModel_updateMessage {
// ...
//end::class[]
- @SuppressWarnings("unused")
private final DomainObjectNatureViewModel mixee;
//tag::class[]
- public DomainObjectNatureViewModel act(@Nullable String newMessage) { //
<.>
+ public DomainObjectNatureViewModel act(@Nullable final String newMessage)
{ // <.>
mixee.setMessage(newMessage);
return mixee;
}
diff --git
a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
index f3e89aafbd..1b4b7174f6 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
@@ -29,7 +29,6 @@ import org.springframework.context.annotation.Import;
import org.apache.causeway.extensions.cors.impl.CausewayModuleExtCors;
import
org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring;
import
org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
-import
org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
import
org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
import
org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
@@ -55,8 +54,8 @@ import lombok.extern.log4j.Log4j2;
// CORS
CausewayModuleExtCors.class,
+ // H2 - PROTOTYPING
CausewayModuleTestingH2ConsoleUi.class, // enables the H2 console menu item
- CausewayModuleExtExcelDownloadWicketUi.class, // allows for collection
download as excel
// services
PrototypeActionsVisibilityAdvisor.class,
diff --git a/examples/demo/wicket/common/pom.xml
b/examples/demo/wicket/common/pom.xml
index 106aba66f2..71dfdb0e77 100644
--- a/examples/demo/wicket/common/pom.xml
+++ b/examples/demo/wicket/common/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>org.apache.causeway.examples.apps</groupId>
<artifactId>demo-web</artifactId>
- <version>${project.version}</version>
</dependency>
@@ -111,6 +110,11 @@
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-fullcalendar-wicket-ui</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.causeway.extensions</groupId>
+
<artifactId>causeway-extensions-exceldownload-wicket-ui</artifactId>
+ </dependency>
</dependencies>
diff --git
a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
index 7b4a68d87b..ec1eddf7c1 100644
---
a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
+++
b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
@@ -22,6 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import
org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi;
+import
org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
import demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory;
@@ -32,6 +33,7 @@ import
demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory;
@Import({
WhereInTheWorldPanelFactory.class,
CausewayModuleExtFullCalendarWicketUi.class,
+ CausewayModuleExtExcelDownloadWicketUi.class, // allows for collection
download as excel
})
public class DemoAppWicketCommon {
