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/01/02 07:51:28 UTC

[13/13] isis git commit: Merge branch 'release-1.11.0-RC1'

Merge branch 'release-1.11.0-RC1'


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/09931193
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/09931193
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/09931193

Branch: refs/heads/master
Commit: 09931193cc6769b5199665a3552e68e708f3e475
Parents: 9742a7c 0f92613
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jan 2 06:50:20 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jan 2 06:50:20 2016 +0000

----------------------------------------------------------------------
 STATUS                                          |   3 +
 .../_migration-notes_1.10.0-to-1.11.0.adoc      |   5 -
 .../main/asciidoc/_release-notes_1.11.0.adoc    |  84 +++++
 .../src/main/asciidoc/doap_isis.rdf             |  19 +-
 .../src/main/asciidoc/downloads.adoc            |  10 +-
 .../_cg_committers_cutting-a-release.adoc       |  34 +-
 .../_cg_committers_post-release-successful.adoc |  30 +-
 ...cg_committers_post-release-unsuccessful.adoc |  24 +-
 .../_cg_committers_verifying-releases.adoc      |   2 +-
 .../asciidoc/guides/_cg_isis-maven-plugin.adoc  |   4 +-
 .../guides/_cg_isis-maven-plugin_swagger.adoc   |   4 +-
 .../guides/_cg_isis-maven-plugin_validate.adoc  |   2 +-
 .../guides/_cg_isis-maven-plugin_xsd.adoc       |   4 +-
 .../guides/_rgant-Action_domainEvent.adoc       |   2 +-
 .../guides/_rgant-Collection_domainEvent.adoc   |   2 +-
 .../asciidoc/guides/_rgant-DomainObject.adoc    |  28 +-
 .../guides/_rgant-DomainObjectLayout.adoc       |   6 +-
 ...gant-DomainObjectLayout_cssClassUiEvent.adoc |   2 +-
 .../_rgant-DomainObjectLayout_iconUiEvent.adoc  |   2 +-
 .../_rgant-DomainObjectLayout_titleUiEvent.adoc |   2 +-
 ...gant-DomainObject_createdLifecycleEvent.adoc |   2 +-
 ...rgant-DomainObject_loadedLifecycleEvent.adoc |   2 +-
 ...nt-DomainObject_persistedLifecycleEvent.adoc |   2 +-
 ...t-DomainObject_persistingLifecycleEvent.adoc |   2 +-
 ...ant-DomainObject_removingLifecycleEvent.adoc |   2 +-
 ...gant-DomainObject_updatedLifecycleEvent.adoc |   2 +-
 ...ant-DomainObject_updatingLifecycleEvent.adoc |   2 +-
 .../guides/_rgant-Parameter_regexPattern.adoc   |   4 +-
 .../guides/_rgant-Property_domainEvent.adoc     |   2 +-
 .../guides/_rgant-Property_regexPattern.adoc    |   6 +-
 .../guides/_rgant-XmlJavaTypeAdapter.adoc       |   4 +-
 .../asciidoc/guides/_rgant-XmlRootElement.adoc  |   4 +-
 .../guides/_rgcfg_configuring-core.adoc         |  30 +-
 .../guides/_rgcms_classes_roles_Dto.adoc        |   4 +-
 .../_rgcms_classes_roles_Persistable.adoc       |   4 +-
 ..._rgcms_classes_super_AbstractSubscriber.adoc |   2 +-
 .../asciidoc/guides/_rgcms_classes_uievent.adoc |   2 +-
 .../_rgcms_classes_uievent_CssClassUiEvent.adoc |   2 +-
 .../_rgcms_classes_uievent_IconUiEvent.adoc     |   2 +-
 .../_rgcms_classes_uievent_TitleUiEvent.adoc    |   2 +-
 .../src/main/asciidoc/guides/_rgsvc_api.adoc    |   4 +-
 .../guides/_rgsvc_api_EventBusService.adoc      |   2 +-
 .../asciidoc/guides/_rgsvc_api_JaxbService.adoc |   4 +-
 .../guides/_rgsvc_api_SwaggerService.adoc       |   4 +-
 .../guides/_rgsvc_api_XmlSnapshotService.adoc   |   5 +-
 .../guides/_rgsvc_spi_UrlEncodingService.adoc   |   4 +-
 .../main/asciidoc/guides/_tg_pet-clinic.adoc    |   2 +-
 .../_tg_stop-scaffolding-start-coding.adoc      |   2 +-
 .../src/main/asciidoc/guides/_ugbtb_i18n.adoc   |   6 +-
 ...r-techniques_overriding-jdo-annotations.adoc |   4 +-
 .../guides/_ugbtb_view-models_jaxb.adoc         |   2 +-
 .../_ugbtb_view-models_programming-model.adoc   |   2 +-
 .../guides/_ugbtb_view-models_use-cases.adoc    |   4 +-
 .../main/asciidoc/guides/_ugbtb_web-xml.adoc    |   6 +-
 .../_ugfun_core-concepts_building-blocks.adoc   |   2 +-
 ...fun_getting-started_simpleapp-archetype.adoc |   4 +-
 .../guides/_ugsec_usage-by-isis-viewers.adoc    |   4 +-
 .../asciidoc/guides/_ugvro_architecture.adoc    |   3 +-
 .../guides/_ugvro_configuration-properties.adoc |   5 +-
 .../_ugvro_simplified-representations.adoc      |   2 +-
 ...epresentations_configuration-properties.adoc |   2 +-
 .../src/main/asciidoc/guides/rgcms.adoc         |   2 +-
 .../asciidoc/guides/simpleapp-archetype.adoc    |   4 +-
 .../documentation/src/main/asciidoc/index.html  |   2 +-
 .../src/main/asciidoc/release-notes.adoc        |   9 +
 core/applib/pom.xml                             |   2 +-
 core/integtestsupport/pom.xml                   |   2 +-
 core/log4j/pom.xml                              |   2 +-
 core/maven-plugin/pom.xml                       |   2 +-
 core/metamodel/pom.xml                          |   2 +-
 core/pom.xml                                    |  64 ++--
 core/runtime/pom.xml                            |   2 +-
 core/schema/pom.xml                             |   2 +-
 core/security-shiro/pom.xml                     |   6 +-
 core/security/pom.xml                           |   2 +-
 core/specsupport/pom.xml                        |   2 +-
 core/unittestsupport/pom.xml                    |   2 +-
 core/viewer-restfulobjects-applib/pom.xml       |   2 +-
 core/viewer-restfulobjects-rendering/pom.xml    |   2 +-
 core/viewer-restfulobjects-server/pom.xml       |   2 +-
 core/viewer-wicket-applib/pom.xml               |   2 +-
 core/viewer-wicket-impl/pom.xml                 |   2 +-
 core/viewer-wicket-model/pom.xml                |   2 +-
 core/viewer-wicket-ui/pom.xml                   |   2 +-
 core/webserver/pom.xml                          |   2 +-
 core/wrapper/pom.xml                            |   2 +-
 example/application/simpleapp/dom/pom.xml       |   6 +-
 example/application/simpleapp/pom.xml           |   2 +-
 .../src/main/webapp/swagger-ui/index.html       |  18 +
 example/archetype/simpleapp/pom.xml             |   4 +-
 .../META-INF/maven/archetype-metadata.xml       |   1 +
 ...ppAppManifestWithFixturesBypassSecurity.java |  38 +++
 .../resources/archetype-resources/dom/pom.xml   |  55 +++-
 .../java/domainapp/dom/simple/SimpleObject.java |  24 +-
 .../dom/simple/SimpleObject.layout.json         |   4 +
 .../domainapp/dom/simple/SimpleObjects.java     |  10 +-
 .../archetype-resources/integtests/pom.xml      |  97 ++++--
 .../main/resources/archetype-resources/pom.xml  |   4 +-
 .../archetype-resources/webapp/pom.xml          |   1 -
 .../webapp/DomainApplication.properties         |  31 ++
 .../src/main/webapp/WEB-INF/isis.properties     |  20 ++
 .../src/main/webapp/WEB-INF/translations-en.po  | 321 +++++++++++++++++-
 .../src/main/webapp/WEB-INF/translations-es.po  | 321 +++++++++++++++++-
 .../src/main/webapp/WEB-INF/translations-nl.po  | 326 ++++++++++++++++++-
 .../src/main/webapp/WEB-INF/translations.po     | 326 ++++++++++++++++++-
 .../webapp/src/main/webapp/WEB-INF/web.xml      |  26 +-
 .../webapp/src/main/webapp/about/index.html     |  18 +-
 .../src/main/webapp/swagger-ui/index.html       | 164 ++++++++++
 .../projects/basic/archetype.properties         |   2 +-
 109 files changed, 2054 insertions(+), 314 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/09931193/adocs/documentation/src/main/asciidoc/_migration-notes_1.10.0-to-1.11.0.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/_migration-notes_1.10.0-to-1.11.0.adoc
index f154f07,2ecaaeb..cf56bfe
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.10.0-to-1.11.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.10.0-to-1.11.0.adoc
@@@ -10,12 -10,22 +10,7 @@@ any difficulties then let us know via t
  issues here.
  
  
- [NOTE]
- ====
- At the time of writing `1.11.0` has not been released; these notes relate to `1.11.0-SNAPSHOT`.
- ====
- 
  
 -== JAXB view models
 -
 -Classes annotated with xref:guides/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`] are now recognized
 -as view models.  These are serialized out into XML and converted into URL.
 -
 -The xref:guides/rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] is responsible for performing the XML conversion.
 -The default implementation is located in the `org.apache.isis.core:isis-core-schema` module, specifically under the
 -`org.apache.isis.core.schema.services` package.
 -
 -If your application is bootstrapped using an `AppManifest` (recommended;
 -xref:guides/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[here]) then the `JaxbService` will automatically be discovered and
 - registered.  However, if you are still using the older `isis.properties` configuration file to explicitly register
 - services then you will need to add in this service.
 -
 -
  == Swagger UI
  
  The new xref:guides/rgsvc.adoc#_rgsvc_api_SwaggerService[`SwaggerService`] allows link:http://swagger.io[Swagger] spec files