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 802c2d7c5caf4f63c0c74f1ad4a61bf4d1701c78 Merge: 766ae65 f56ba3d Author: Dan Haywood <[email protected]> AuthorDate: Fri Aug 26 14:23:22 2022 +0100 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT .run/HelloWorldApp.run.xml | 2 +- README.adoc | 46 +++++++++++++++++++++---- pom.xml | 16 +++++++-- src/main/java/domainapp/webapp/AppManifest.java | 2 ++ 4 files changed, 57 insertions(+), 9 deletions(-) diff --cc README.adoc index a3718ac,3994129..f39053f --- a/README.adoc +++ b/README.adoc @@@ -60,19 -70,43 +70,43 @@@ The app runs with H2 running in-memory - == Development + [#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: - Apache Isis uses DataNucleus as its ORM, which requires that any entities are "enhanced", a post-compile process. -* 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] ---- - mvn datanucleus:enhance -o --javaagent:lib/spring-instrument.jar ++mvn -pl module-simple datanucleus:enhance -o ---- - This is useful to know if the application fails to bootstrap, complaining of "unenhanced entities". ++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` - diff --cc src/main/java/domainapp/webapp/AppManifest.java index aa985dd,71924b4..bd2ed2c --- a/src/main/java/domainapp/webapp/AppManifest.java +++ b/src/main/java/domainapp/webapp/AppManifest.java @@@ -24,8 -25,9 +25,9 @@@ import domainapp.modules.hello.HelloWor IsisModuleCoreRuntimeServices.class, IsisModuleSecurityShiro.class, - IsisModulePersistenceJpaEclipselink.class, + IsisModulePersistenceJdoDatanucleus.class, IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, + IsisModuleViewerWicketApplibMixins.class, IsisModuleViewerWicketViewer.class, IsisModuleTestingH2ConsoleUi.class,
