You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/12/13 15:31:52 UTC
[45/52] [abbrv] isis git commit: ISIS-1237: merge feature branch
ISIS-1237: merge feature branch
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c64caa1a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c64caa1a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c64caa1a
Branch: refs/heads/ISIS-1224-select2-v4
Commit: c64caa1ae9f3dbf984855bfd5109f2fa19e4a759
Parents: 2d9b2ee 9ac72b5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 11 10:24:04 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 11 10:24:04 2015 +0000
----------------------------------------------------------------------
adocs/documentation/Gemfile.lock | 3 -
.../_migration-notes_1.10.0-to-1.11.0.adoc | 27 +
.../isis/applib/annotation/NatureOfService.java | 22 +-
.../services/i18n/TranslatableString.java | 1 +
.../applib/services/swagger/SwaggerService.java | 72 ++
.../services/swagger/SwaggerServiceMenu.java | 80 ++
.../isis/applib/services/swagger/Util.java | 46 ++
core/metamodel/pom.xml | 11 +
.../services/swagger/SwaggerServiceDefault.java | 81 ++
.../services/swagger/internal/Caching.java | 48 ++
.../swagger/internal/SwaggerSpecGenerator.java | 826 +++++++++++++++++++
.../services/swagger/internal/Util.java | 164 ++++
.../swagger/internal/ValuePropertyFactory.java | 174 ++++
.../internal/SwaggerSpecGeneratorTest.java | 69 ++
.../i18n/po/TranslationServicePoMenu.java | 37 +-
.../ContentNegotiationServiceAbstract.java | 19 +-
core/viewer-restfulobjects-server/pom.xml | 11 +
.../server/RestfulObjectsApplication.java | 3 +
...estfulObjectsApplicationExceptionMapper.java | 12 +-
.../server/resources/SwaggerSpecResource.java | 125 +++
.../java/domainapp/dom/simple/SimpleObject.java | 1 +
example/application/simpleapp/webapp/pom.xml | 1 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 17 +-
.../webapp/src/main/webapp/about/index.html | 18 +-
.../src/main/webapp/swagger-ui/index.html | 122 +++
25 files changed, 1945 insertions(+), 45 deletions(-)
----------------------------------------------------------------------