You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/02/28 15:03:45 UTC
[isis] 03/03: Merge branch 'master' of
https://github.com/apache/isis
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44af29cd96e0acda7920827a10144bfdd516019b
Merge: f058eac 59da0e2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 28 16:00:10 2018 +0100
Merge branch 'master' of https://github.com/apache/isis
...esentation-layer_ContentNegotiationService.adoc | 10 +-
.../apache/isis/applib/AppManifestAbstract2.java | 32 ----
.../org/apache/isis/applib/IsisApplibModule.java | 27 +++-
.../isis/applib/ModuleOrBuilderAbstract.java | 39 ++++-
.../isis/applib/domain/DomainObjectList.java | 176 +++++++++++++++++++++
.../exceprecog/ExceptionRecognizerAbstract.java | 8 +-
.../exceprecog/ExceptionRecognizerForType.java | 3 +-
.../isis/applib/services/jaxb/JaxbService.java | 42 +++--
.../applib/services/jaxb/JaxbServiceDefault.java | 67 +++++++-
.../java/org/apache/isis/applib/util/JaxbUtil.java | 8 +-
.../apache/isis/schema/utils/ChangesDtoUtils.java | 1 +
.../jaxbadapters/PersistentEntitiesAdapter.java | 66 ++++++++
.../action/ActionAnnotationFacetFactory.java | 12 +-
.../action/associateWith/AssociatedWithFacet.java | 21 +--
.../associateWith/AssociatedWithFacetAbstract.java | 28 ++--
.../AssociatedWithFacetForActionAnnotation.java | 19 +--
...onParameterDefaultsAndChoicesPostProcessor.java | 91 +++++++----
...eterDefaultsFacetFromAssociatedCollection.java} | 4 +-
.../services/swagger/internal/Generation.java | 1 +
.../core/metamodel/spec/feature/ObjectAction.java | 15 +-
.../viewer/restfulobjects/rendering/Responses.java | 15 ++
.../domainobjects/ActionResultReprRenderer.java | 7 +
.../domainobjects/ObjectAndActionInvocation.java | 9 ++
...entNegotiationServiceForRestfulObjectsV1_0.java | 174 ++++++++++++++++++--
.../server/resources/DomainResourceHelper.java | 2 +-
.../ui/components/collection/CollectionPanel.java | 7 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 6 +-
.../application/logging-integtest.properties | 10 ++
.../application/DomainAppApplicationModule.java | 3 +
.../module-simple/logging-integtest.properties | 9 ++
.../domainapp/modules/simple/SimpleModule.java | 5 +-
31 files changed, 738 insertions(+), 179 deletions(-)
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.