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 2016/04/08 13:08:39 UTC
[2/2] isis git commit: ISIS-1361: BookmarkService2 fix,
concurrency fix
ISIS-1361: BookmarkService2 fix, concurrency fix
merged from branch 'release-1.12.1-RC1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3e0a2d4c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3e0a2d4c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3e0a2d4c
Branch: refs/heads/master
Commit: 3e0a2d4c7de64df1f0742b723a36dcbb87007d33
Parents: ebc692a 3646d0a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 12:06:10 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 12:06:10 2016 +0100
----------------------------------------------------------------------
.../guides/_rgsvc_api_BookmarkService.adoc | 23 +++++----
.../asciidoc/guides/_rgsvc_integration-api.adoc | 4 +-
.../services/bookmark/BookmarkService.java | 11 ++++-
.../services/bookmark/BookmarkService2.java | 52 ++++++++++++++++++++
.../PersistenceSessionService.java | 3 +-
.../noruntime/RuntimeContextNoRuntime.java | 5 +-
.../bookmarks/BookmarkServiceDefault.java | 41 ++++++++++++---
.../persistence/adapter/PojoAdapter.java | 2 +-
.../container/DomainObjectContainerResolve.java | 9 +++-
.../internal/RuntimeContextFromSession.java | 7 ++-
.../system/persistence/PersistenceSession.java | 11 +++--
.../jaxbadapters/PersistentEntityAdapter.java | 5 +-
.../wicket/ui/pages/entity/EntityPage.java | 13 +++--
13 files changed, 150 insertions(+), 36 deletions(-)
----------------------------------------------------------------------