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/08/26 13:16:49 UTC
[isis-app-simpleapp] 04/04: 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-simpleapp.git
commit 3edbb354436e1768c8a664b3137e7a2f9c8986e2
Merge: bde58b4 9674161
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Aug 26 14:10:48 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
README.adoc | 6 +++---
webapp/pom.xml | 9 +++++++--
webapp/src/main/java/domainapp/webapp/AppManifest.java | 4 ++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --cc README.adoc
index b922b66,48f2a5e..84d16eb
--- a/README.adoc
+++ b/README.adoc
@@@ -117,44 -116,45 +116,45 @@@ The `pom.xml` also provides goals to ru
It's more common for tests to reside within the same module, but we moved them into their own Maven modules because it makes them easier to be temporarily excluded, eg during initial explorations/prototyping.
+ [#orm-support]
== ORM Support
-This version of the application uses EclipseLink JPA as its ORM, configured with load-time weaving.
-This requires that the application be run with a Java agent.
+//This version of the application uses EclipseLink JPA as its ORM, configured with load-time weaving.
+//This requires that the application be run with a Java agent.
+//
+//The spring-boot plugin is configured to run with this agent already.
+//If you want to run from an IDE:
+//
+//* first, you might wish to copy the file locally:
+//+
+//[source,bash]
+//----
+//cp ~/.m2/repository/org/springframework/spring-instrument/XXX/spring-instrument-XXX.jar lib/spring-instrument.jar
+//----
+//+
+//Change "XXX" to the value that `${spring-framework.version}` resolves to in the webapp `pom.xml`
+//
+//* Then specify the agent as a VM option:
+//+
+//[source,bash]
+//----
+//-javaagent:lib/spring-instrument.jar
+//----
-The spring-boot plugin is configured to run with this agent already.
-If you want to run from an IDE:
-* first, you might wish to copy the file locally:
-+
-[source,bash]
-----
-cp ~/.m2/repository/org/springframework/spring-instrument/XXX/spring-instrument-XXX.jar lib/spring-instrument.jar
-----
-+
-Change "XXX" to the value that `${spring-framework.version}` resolves to in the webapp `pom.xml`
-* Then specify the agent as a VM option:
-+
+This version of the application uses DataNucleus as its ORM, which requires that any entities are "enhanced", a post-compile process.
+
+Normally this is done as part of a "mvn clean install", but the entities can also be enhanced explicity using:
+
[source,bash]
----
--javaagent:lib/spring-instrument.jar
+mvn -pl module-simple datanucleus:enhance -o
----
+This is useful to know if the application or integration test fails to bootstrap, complaining of "unenhanced entities".
-
-//This version of the application uses DataNucleus as its ORM, which requires that any entities are "enhanced", a post-compile process.
-//
-//Normally this is done as part of a "mvn clean install", but the entities can also be enhanced explicity using:
-//
-//[source,bash]
-//----
-//mvn -pl module-simple datanucleus:enhance -o
-//----
-//
-//This is useful to know if the application or integration test fails to bootstrap, complaining of "unenhanced entities".
-//
-//TIP: You can also use `enhance-all.sh`
+TIP: You can also use `enhance-all.sh`
== Testing
diff --cc webapp/pom.xml
index 5903434,e1d6bce..4171a01
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -124,9 -127,14 +124,14 @@@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-executionoutbox-persistence-jpa</artifactId>
+ <artifactId>isis-extensions-executionoutbox-persistence-jdo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java
index 20e178d,3d34d8f..8430570
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@@ -9,13 -9,13 +9,14 @@@ import org.apache.isis.applib.IsisModul
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.jpa.IsisModuleExtAuditTrailPersistenceJpa;
-import org.apache.isis.extensions.commandlog.jpa.IsisModuleExtCommandLogPersistenceJpa;
-import org.apache.isis.extensions.executionlog.jpa.IsisModuleExtExecutionLogPersistenceJpa;
-import org.apache.isis.extensions.executionoutbox.jpa.IsisModuleExtExecutionOutboxPersistenceJpa;
+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.sessionlog.jpa.IsisModuleExtSessionLogPersistenceJpa;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+import org.apache.isis.extensions.sessionlog.jdo.IsisModuleExtSessionLogPersistenceJdo;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
++import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleusMixins;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
@@@ -36,8 -37,9 +38,10 @@@ import domainapp.webapp.quartz.QuartzMo
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModulePersistenceJpaEclipselink.class,
+ IsisModulePersistenceJdoDatanucleus.class,
++ IsisModulePersistenceJdoDatanucleusMixins.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ IsisModuleViewerWicketApplibMixins.class,
IsisModuleViewerWicketViewer.class,
IsisModuleTestingFixturesApplib.class,