This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-3.5.0-RC1-jdo in repository https://gitbox.apache.org/repos/asf/causeway-app-helloworld.git
commit cdc21309cd9bc5727a6fb6e5afbee2125901ed85 Merge: 6fbd0b7 f5f1f48 Author: Dan Haywood <[email protected]> AuthorDate: Thu Nov 13 06:16:05 2025 +0000 merges to 3.5.0 .run/HelloWorldApp (jdo).run.xml | 4 +- .run/helloworld-jdo [datanucleus_enhance].run.xml | 32 +++++++++++++++ README.adoc | 48 ++--------------------- build.sh | 1 + pom.xml | 7 ++-- run.sh | 1 + 6 files changed, 43 insertions(+), 50 deletions(-) diff --cc .run/HelloWorldApp (jdo).run.xml index be8e7d2,0000000..ce8bcad mode 100644,000000..100644 --- a/.run/HelloWorldApp (jdo).run.xml +++ b/.run/HelloWorldApp (jdo).run.xml @@@ -1,11 -1,0 +1,11 @@@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="HelloWorldApp (jdo)" 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" /> + <option name="WORKING_DIRECTORY" value="file://$MODULE_WORKING_DIR$" /> + <method v="2"> + <option name="Make" enabled="true" /> ++ <option name="RunConfigurationTask" enabled="true" run_configuration_name="helloworld-jdo [datanucleus:enhance]" run_configuration_type="MavenRunConfiguration" /> + </method> + </configuration> +</component> diff --cc .run/helloworld-jdo [datanucleus_enhance].run.xml index 0000000,a49f857..905de24 mode 000000,100644..100644 --- a/.run/helloworld-jdo [datanucleus_enhance].run.xml +++ b/.run/helloworld-jdo [datanucleus_enhance].run.xml @@@ -1,0 -1,32 +1,32 @@@ + <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="helloworld-jpa [eclipselink:weave]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true"> ++ <configuration default="false" name="helloworld-jdo [datanucleus:enhance]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true"> + <MavenSettings> + <option name="myGeneralSettings" /> + <option name="myRunnerSettings" /> + <option name="myRunnerParameters"> + <MavenRunnerParameters> + <option name="cmdOptions" /> + <option name="profiles"> + <set /> + </option> + <option name="goals"> + <list> - <option value="eclipselink:weave" /> ++ <option value="datanucleus:enhance" /> + </list> + </option> + <option name="multimoduleDir" /> + <option name="pomFileName" /> + <option name="profilesMap"> + <map /> + </option> + <option name="projectsCmdOptionValues"> + <list /> + </option> + <option name="resolveToWorkspace" value="false" /> + <option name="workingDirPath" value="$PROJECT_DIR$" /> + </MavenRunnerParameters> + </option> + </MavenSettings> + <method v="2" /> + </configuration> + </component> diff --cc README.adoc index 64bbbbd,9258def..2732d96 --- a/README.adoc +++ b/README.adoc @@@ -68,52 -58,3 +58,20 @@@ mvn spring-boot:ru + The app runs with H2 running in-memory. + + +[#orm-support] +== ORM Support + - // EclipseLink : START - - //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 - //---- - - // EclipseLink : END - - - - // DataNucleus : START - +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` - - // DataNucleus : END diff --cc pom.xml index 1da6117,cce95a9..a37eee2 --- a/pom.xml +++ b/pom.xml @@@ -11,11 -11,11 +11,11 @@@ <relativePath/> </parent> - <artifactId>helloworld-jpa</artifactId> + <artifactId>helloworld-jdo</artifactId> <groupId>org.apache.causeway.starters</groupId> - <version>3.4.0</version> + <version>3.5.0</version> - <name>HelloWorld (JPA)</name> + <name>HelloWorld (JDO)</name> <packaging>jar</packaging>
