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 2021/04/05 14:22:18 UTC

[isis-app-simpleapp] branch jpa-SNAPSHOT updated (6f24971 -> d17467e)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.


 discard 6f24971  Merge branch 'jpa' into jpa-SNAPSHOT
 discard 43eb4d2  adds notes on eclipselink.weaving
     new eb503d6  adds notes on eclipselink.weaving
     new d17467e  Merge branch 'jpa' into jpa-SNAPSHOT

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6f24971)
            \
             N -- N -- N   refs/heads/jpa-SNAPSHOT (d17467e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 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:

[isis-app-simpleapp] 01/02: adds notes on eclipselink.weaving

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit eb503d6c399200fd9e5f51b460a9adb127b0e6da
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 5 11:00:30 2021 +0100

    adds notes on eclipselink.weaving
---
 lib/README.txt                            |   3 +++
 lib/spring-instrument-5.3.5.jar           | Bin 0 -> 7429 bytes
 webapp/src/main/resources/application.yml |   7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/lib/README.txt b/lib/README.txt
new file mode 100644
index 0000000..8cd1712
--- /dev/null
+++ b/lib/README.txt
@@ -0,0 +1,3 @@
+If eclipselink.weaving=true, then run using JVM argument:
+
+ -javaagent:lib/spring-instrument-5.3.5.jar
diff --git a/lib/spring-instrument-5.3.5.jar b/lib/spring-instrument-5.3.5.jar
new file mode 100644
index 0000000..164db3b
Binary files /dev/null and b/lib/spring-instrument-5.3.5.jar differ
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 1add5af..986d6cf 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -72,6 +72,13 @@ isis:
       auto-create-schemas: SIMPLE
       create-schema-sql-template: "CREATE SCHEMA IF NOT EXISTS %S"
 
+eclipselink:
+  # if enabled, then must be run with JVM arg:
+  # -javaagent:lib/spring-instrument-5.3.5.jar
+  weaving: false
+  # if weaving subproperties are required, then specify all eclipselink.weaving
+  # properties using application.properties instead (it's not possible to
+  # specify both eclipselink.weaving property and its subsproperties using yaml syntax)
 
 resteasy:
   jaxrs:

[isis-app-simpleapp] 02/02: Merge branch 'jpa' into jpa-SNAPSHOT

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit d17467efab7fa67912b9dd48c71936364fa88542
Merge: 5b388c4 eb503d6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 5 15:21:37 2021 +0100

    Merge branch 'jpa' into jpa-SNAPSHOT

 lib/README.txt                                           |   3 +++
 lib/spring-instrument-5.3.5.jar                          | Bin 0 -> 7429 bytes
 .../domainapp/modules/simple/dom/so/SimpleObject.java    |   6 ++++++
 .../domainapp/modules/simple/dom/so/SimpleObjects.java   |  11 +++++++++++
 webapp/src/main/resources/application.yml                |   7 +++++++
 webapp/src/main/resources/menubars.layout.xml            |   3 +++
 6 files changed, 30 insertions(+)