You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/16 15:06:52 UTC
[isis-app-helloworld] branch master updated: updates to latest,
fixes version
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
The following commit(s) were added to refs/heads/master by this push:
new 7caf08d updates to latest, fixes version
7caf08d is described below
commit 7caf08d0e1ff4c0df18cbd7cf03c370a70c77c64
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 16:06:37 2020 +0100
updates to latest, fixes version
---
pom.xml | 9 ++--
src/main/java/domainapp/webapp/HelloWorldApp.java | 32 ++++++-----
src/main/resources/application.yml | 63 ++++++++++++----------
src/main/resources/config/application.properties | 10 ++--
src/main/webapp/WEB-INF/web.xml | 10 ----
.../dom/impl/HelloWorldObject_delete_Test.java | 2 +-
6 files changed, 66 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index fcdf776..db3952b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,10 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M2.20191216-0404-91276ff1</version>
+ <version>2.0.0-M2.20200116-1350-2dd6b3a2</version>
+<!--
+ <version>2.0.0-M3-SNAPSHOT</version>
+-->
</parent>
<groupId>org.apache.isis.starters</groupId>
@@ -64,8 +67,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-h2console-dom</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-h2console-ui</artifactId>
</dependency>
diff --git a/src/main/java/domainapp/webapp/HelloWorldApp.java b/src/main/java/domainapp/webapp/HelloWorldApp.java
index 243e0d4..ece283c 100644
--- a/src/main/java/domainapp/webapp/HelloWorldApp.java
+++ b/src/main/java/domainapp/webapp/HelloWorldApp.java
@@ -1,18 +1,22 @@
package domainapp.webapp;
-import domainapp.modules.hello.HelloWorldModule;
-
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.h2console.dom.IsisModuleExtH2Console;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
-import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
-import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
+import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
+import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
+
+import domainapp.modules.hello.HelloWorldModule;
@SpringBootApplication
@Import({
@@ -26,13 +30,13 @@ public class HelloWorldApp extends SpringBootServletInitializer {
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleRestfulObjectsViewer.class,
- IsisModuleWicketViewer.class,
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ IsisModuleViewerWicketViewer.class,
- IsisModuleExtH2Console.class,
+ IsisModuleTestingH2ConsoleUi.class,
HelloWorldModule.class
})
public static class AppManifest {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 85252d1..5e87e85 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,33 +4,35 @@
# See also config/application.properties
#
isis:
- reflector:
- explicit-annotations:
- action: true
- validator:
- allow-deprecated: false
- no-params-only: true
- explicit-object-type: true
- service-actions-only: true
- mixins-only: true
- facet:
- css-class-fa:
- patterns:
- new.*:fa-plus,
- add.*:fa-plus-square,
- create.*:fa-plus,
- update.*:fa-edit,
- delete.*:fa-trash,
- find.*:fa-search,
- list.*:fa-list
+ applib:
+ annotation:
+ action:
+ explicit: true
+ action-layout:
+ css-class-fa:
+ patterns:
+ new.*:fa-plus,
+ add.*:fa-plus-square,
+ create.*:fa-plus,
+ update.*:fa-edit,
+ delete.*:fa-trash,
+ find.*:fa-search,
+ list.*:fa-list
+ css-class:
+ patterns:
+ delete.*:btn-danger
+ domain-object:
+ editing: false
- css-class:
- patterns:
- delete.*:btn-danger
-
- objects:
- editing: false
+ core:
+ meta-model:
+ validator:
+ allow-deprecated: false
+ no-params-only: true
+ explicit-object-type: true
+ service-actions-only: true
+ mixins-only: true
viewer:
wicket:
@@ -59,8 +61,8 @@ isis:
development-utilities:
enable: true
- persistor:
- datanucleus:
+ persistence:
+ jdo-datanucleus:
impl:
# note that properties under 'isis.persistor.datanucleus.impl' are passed through directly
# to DataNucleus, and must use camelCase rather than kebab-case
@@ -78,6 +80,13 @@ isis:
type: none
mode: ENABLE_SELECTIVE
+resteasy:
+ jaxrs:
+ app:
+ registration: beans
+ defaultPath: "/restful"
+
spring:
banner:
location: banner.txt
+
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index 80ff092..93135ec 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -8,10 +8,10 @@
#
-# note that properties under 'isis.persistor.datanucleus.impl' are passed through directly
+# note that properties under 'isis.persistence.jdo-datanucleus.impl' are passed through directly
# to DataNucleus, and must use camelCase rather than kebab-case
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL = jdbc:h2:mem:test
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName = org.h2.Driver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName = sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword =
+isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionURL = jdbc:h2:mem:test
+isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionDriverName = org.h2.Driver
+isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionUserName = sa
+isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionPassword =
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dc22e99..0000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- id="WebApp_ID" version="3.1">
-
- <display-name>Hello World</display-name>
-
-
-</web-app>
diff --git a/src/test/java/domainapp/modules/hello/dom/impl/HelloWorldObject_delete_Test.java b/src/test/java/domainapp/modules/hello/dom/impl/HelloWorldObject_delete_Test.java
index a6b1cd4..bfdc6c9 100644
--- a/src/test/java/domainapp/modules/hello/dom/impl/HelloWorldObject_delete_Test.java
+++ b/src/test/java/domainapp/modules/hello/dom/impl/HelloWorldObject_delete_Test.java
@@ -10,7 +10,7 @@ import org.junit.Test;
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.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.containsString;