[causeway-app-helloworld] 03/03: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

[da...@apache.org]

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/causeway-app-helloworld.git

commit ae24972c314779812988c97051c49246548335ac
Merge: 96d3a87 feaadc2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 16 09:21:58 2023 +0000

    Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

 ...elloWorldApp.run.xml => HelloWorldApp (jdo).run.xml} |  8 +++-----
 .../modules/hello/dom/hwo/HelloWorldObject.layout.xml   | 17 ++++++++++-------
 src/main/resources/menubars.layout.xml                  |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --cc .run/HelloWorldApp (jdo).run.xml
index 4abd040,4843e15..473b3d1
--- a/.run/HelloWorldApp (jdo).run.xml
+++ b/.run/HelloWorldApp (jdo).run.xml
@@@ -1,10 -1,11 +1,8 @@@
  <component name="ProjectRunConfigurationManager">
-   <configuration default="false" name="HelloWorldApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 -  <configuration default="false" name="HelloWorldApp (jpa)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 -    <module name="helloworld-jpa" />
++  <configuration default="false" name="HelloWorldApp (jdo)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 +    <option name="ACTIVE_PROFILES" />
 +    <module name="helloworld-jdo" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="domainapp.webapp.HelloWorldApp" />
-     <method v="2">
-       <option name="Make" enabled="true" />
-     </method>
 -    <option name="VM_PARAMETERS" value="-javaagent:lib/spring-instrument.jar" />
+     <option name="WORKING_DIRECTORY" value="file://$MODULE_WORKING_DIR$" />
 -    <method v="2">
 -      <option name="Make" enabled="true" />
 -    </method>
    </configuration>
- </component>
+ </component>