You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/02/16 09:25:36 UTC
[causeway-app-helloworld] branch jdo-SNAPSHOT updated (96d3a87 -> ae24972)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-helloworld.git
from 96d3a87 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
new f535bf3 CAUSEWAY-3360 : fixes up xsd namespaces
new feaadc2 renames .run.xml files
new ae24972 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...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(-)
rename .run/{HelloWorldApp.run.xml => HelloWorldApp (jdo).run.xml} (50%)
[causeway-app-helloworld] 01/03: CAUSEWAY-3360 : fixes up xsd namespaces
Posted by 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 f535bf36e84d12a78550590397d2679c98cecea4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 16 09:17:07 2023 +0000
CAUSEWAY-3360 : fixes up xsd namespaces
---
.../modules/hello/dom/hwo/HelloWorldObject.layout.xml | 17 ++++++++++-------
src/main/resources/menubars.layout.xml | 6 +++---
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
index 3e43373..2d6693e 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="http://causeway.apache.org/applib/layout/component" xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+<bs3:grid
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component"
+ xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
- <c:domainObject bookmarking="AS_ROOT"/>
+ <cpt:domainObject bookmarking="AS_ROOT"/>
</bs3:col>
</bs3:row>
<bs3:row>
@@ -14,28 +17,28 @@
<bs3:tab name="Identity">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Identity" id="identity"/>
+ <cpt:fieldSet name="Identity" id="identity"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Metadata">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Metadata" id="metadata"/>
+ <cpt:fieldSet name="Metadata" id="metadata"/>
</bs3:col>
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
</bs3:col>
<bs3:col span="12">
- <c:fieldSet name="Details" id="details"/>
+ <cpt:fieldSet name="Details" id="details"/>
</bs3:col>
</bs3:row>
</bs3:col>
diff --git a/src/main/resources/menubars.layout.xml b/src/main/resources/menubars.layout.xml
index 24f94d9..fcc1b42 100644
--- a/src/main/resources/menubars.layout.xml
+++ b/src/main/resources/menubars.layout.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<mb3:menuBars
- xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd"
- xmlns:cpt="http://causeway.apache.org/applib/layout/component"
- xmlns:mb3="http://causeway.apache.org/applib/layout/menubars/bootstrap3"
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/menubars/bootstrap3 https://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd"
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component"
+ xmlns:mb3="https://causeway.apache.org/applib/layout/menubars/bootstrap3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<mb3:primary>
<mb3:menu>
[causeway-app-helloworld] 03/03: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
Posted by 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>
[causeway-app-helloworld] 02/03: renames .run.xml files
Posted by 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 feaadc2995fef5829237a95d5c0826a2106603c7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 16 09:19:26 2023 +0000
renames .run.xml files
---
.run/{HelloWorldApp.run.xml => HelloWorldApp (jpa).run.xml} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.run/HelloWorldApp.run.xml b/.run/HelloWorldApp (jpa).run.xml
similarity index 61%
rename from .run/HelloWorldApp.run.xml
rename to .run/HelloWorldApp (jpa).run.xml
index fc89df7..4843e15 100644
--- a/.run/HelloWorldApp.run.xml
+++ b/.run/HelloWorldApp (jpa).run.xml
@@ -1,11 +1,11 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="HelloWorldApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <option name="ACTIVE_PROFILES" />
+ <configuration default="false" name="HelloWorldApp (jpa)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="helloworld-jpa" />
<option name="SPRING_BOOT_MAIN_CLASS" value="domainapp.webapp.HelloWorldApp" />
<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>
\ No newline at end of file