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 2022/07/31 21:11:27 UTC
[isis-app-helloworld] 01/02: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 43d7a4779428982d23039ff11e40a6238d5c30b7
Merge: c86d10f 4366514
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jul 31 12:07:38 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
.run/HelloWorldApp.run.xml | 10 ++++++++++
README.adoc | 2 +-
.../modules/hello/dom/hwo/HelloWorldObject.layout.xml | 5 ++++-
src/main/java/domainapp/webapp/AppManifest.java | 5 +++++
src/main/resources/static/css/application.css | 3 +++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --cc .run/HelloWorldApp.run.xml
index 0000000,85d65f3..0ecd5d9
mode 000000,100644..100644
--- a/.run/HelloWorldApp.run.xml
+++ b/.run/HelloWorldApp.run.xml
@@@ -1,0 -1,10 +1,10 @@@
+ <component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="HelloWorldApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <option name="ACTIVE_PROFILES" />
- <module name="helloworld-jpa" />
++ <module name="helloworld-jdo" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="domainapp.webapp.HelloWorldApp" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ </component>
diff --cc src/main/java/domainapp/webapp/AppManifest.java
index 5e4ae10,4f2e6cd..aa985dd
--- a/src/main/java/domainapp/webapp/AppManifest.java
+++ b/src/main/java/domainapp/webapp/AppManifest.java
@@@ -5,9 -5,11 +5,11 @@@ import org.springframework.context.anno
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.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
@@@ -17,9 -19,12 +19,12 @@@ import domainapp.modules.hello.HelloWor
@Configuration
@Import({
+ IsisModuleApplibMixins.class,
+ IsisModuleApplibChangeAndExecutionLoggers.class,
+
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModulePersistenceJpaEclipselink.class,
+ IsisModulePersistenceJdoDatanucleus.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,