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/04/14 15:58:37 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (fd1b76d -> 82b1516)
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/isis-app-simpleapp.git
from fd1b76d Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add b30bfe9 fixes up compile issues from latest changes in master
new 82b1516 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
The 1 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:
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
.../src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java | 1 -
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
.../main/java/domainapp/webapp/custom/restapi/CustomController.java | 2 +-
webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java | 3 ++-
8 files changed, 9 insertions(+), 9 deletions(-)
[isis-app-simpleapp] 01/01: 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/isis-app-simpleapp.git
commit 82b151682a2798ab05c066113a8940aaa9fecba8
Merge: fd1b76d b30bfe9
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 16:48:39 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
.../src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java | 1 -
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
.../main/java/domainapp/webapp/custom/restapi/CustomController.java | 2 +-
webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java | 3 ++-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --cc module-simple-tests/pom.xml
index ee84146,7f7e844..b06adba
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@@ -6,12 -6,12 +6,12 @@@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-jpa-module-simple-tests</artifactId>
- <name>SimpleApp (JPA) - Simple Module (tests)</name>
+ <artifactId>simpleapp-jdo-module-simple-tests</artifactId>
+ <name>SimpleApp (JDO) - Simple Module (tests)</name>
<description>
Integ tests for 'simple module'
diff --cc module-simple/pom.xml
index 059b3ee,76fbb98..76a4964
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@@ -6,12 -6,12 +6,12 @@@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-jpa-module-simple</artifactId>
- <name>SimpleApp (JPA) - Simple Module</name>
+ <artifactId>simpleapp-jdo-module-simple</artifactId>
+ <name>SimpleApp (JDO) - Simple Module</name>
<build>
<resources>
diff --cc module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index 1764d92,6e076d3..ab78719
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@@ -72,12 -80,15 +72,11 @@@ public class SimpleObjects
@Programmatic
public void ping() {
- jpaSupportService.getEntityManager(SimpleObject.class)
- .mapSuccess(entityManager -> {
- final TypedQuery<SimpleObject> q = entityManager.createQuery(
- "SELECT p FROM SimpleObject p ORDER BY p.name",
- SimpleObject.class)
- .setMaxResults(1);
- return q.getResultList();
- })
- .ifFailureFail();
+ JDOQLTypedQuery<SimpleObject> q = jdoSupportService.newTypesafeQuery(SimpleObject.class);
+ final QSimpleObject candidate = QSimpleObject.candidate();
+ q.range(0,2);
+ q.orderBy(candidate.name.asc());
+ q.executeList();
}
-
}
diff --cc pom.xml
index abae58b,a4c5193..1dcd574
--- a/pom.xml
+++ b/pom.xml
@@@ -11,10 -11,10 +11,10 @@@
</parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
- <name>SimpleApp (JPA) - Parent</name>
+ <name>SimpleApp (JDO) - Parent</name>
<packaging>pom</packaging>
diff --cc webapp-tests/pom.xml
index 9c3f5f8,63b0487..738dc74
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@@ -4,12 -4,12 +4,12 @@@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-jpa-webapp-tests</artifactId>
- <name>SimpleApp (JPA) - Webapp (tests)</name>
+ <artifactId>simpleapp-jdo-webapp-tests</artifactId>
+ <name>SimpleApp (JDO) - Webapp (tests)</name>
<description>
Integ tests for entire app.
diff --cc webapp/pom.xml
index 55bf8e5,7bf3d96..5b494e4
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -4,12 -4,12 +4,12 @@@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-jpa-webapp</artifactId>
- <name>SimpleApp (JPA) - Webapp</name>
+ <artifactId>simpleapp-jdo-webapp</artifactId>
+ <name>SimpleApp (JDO) - Webapp</name>
<description>
Assembles and runs both the Wicket viewer and the Restfulobjects viewer