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/10/28 07:33:19 UTC

[16/21] isis git commit: Merge branch 'ISIS-1223-upgrade-to-wicket-7' into ISIS-1224-select2-v4

Merge branch 'ISIS-1223-upgrade-to-wicket-7' into ISIS-1224-select2-v4


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

Branch: refs/heads/master
Commit: 5576387731bc74affcc34c5c39899a67c7d71676
Parents: 7b5bfad f4697c6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 25 15:17:08 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 25 15:17:08 2016 +0100

----------------------------------------------------------------------
 README.adoc                                     |   9 +-
 STATUS                                          |   6 +
 adocs/documentation/README.adoc                 |   2 +-
 adocs/documentation/monitor.rb                  |  42 +-
 adocs/documentation/monitor.sh                  |   2 +-
 adocs/documentation/pom.xml                     | 390 ++++++----
 .../_migration-notes_1.10.0-to-1.11.0.adoc      |  90 ++-
 .../_migration-notes_1.11.0-to-1.12.0.adoc      |  20 +
 ...tes_1.8.0-to-1.9.0_exception-recognizer.adoc |   2 +-
 ..._fixture-scripts-specification-provider.adoc |   2 +-
 .../_migration-notes_1.9.0-to-1.10.0.adoc       |   6 +-
 .../asciidoc/_powered-by_gesconsultor-grc.adoc  |   2 +-
 .../main/asciidoc/_release-notes_1.11.0.adoc    |  84 ++
 .../main/asciidoc/_release-notes_1.11.1.adoc    |  20 +
 .../main/asciidoc/_release-notes_1.12.0.adoc    | 112 +++
 .../applib/layout/component/component.xsd       | 136 ++++
 .../layout/grid/bootstrap3/bootstrap3.xsd       | 143 ++++
 .../src/main/asciidoc/doap_isis.rdf             |  36 +-
 .../src/main/asciidoc/documentation.adoc        |  96 ++-
 .../src/main/asciidoc/downloads.adoc            |  12 +-
 .../asciidoc/guides/_cg_asciidoc-templates.adoc | 729 -----------------
 .../src/main/asciidoc/guides/_cg_asciidoc.adoc  | 205 -----
 .../main/asciidoc/guides/_cg_building-isis.adoc | 222 ------
 .../src/main/asciidoc/guides/_cg_cmd-line.adoc  |   9 -
 .../guides/_cg_committers-applying-patches.adoc |  90 ---
 .../main/asciidoc/guides/_cg_committers.adoc    |  28 -
 .../_cg_committers_cutting-a-release.adoc       | 670 ----------------
 .../guides/_cg_committers_key-generation.adoc   | 571 --------------
 .../_cg_committers_merging-a-pull-request.adoc  | 123 ---
 .../guides/_cg_committers_pmc-notes.adoc        |  71 --
 .../_cg_committers_post-release-successful.adoc | 417 ----------
 ...cg_committers_post-release-unsuccessful.adoc |  94 ---
 ...ommitters_release-process-for-snapshots.adoc |  88 ---
 .../_cg_committers_release-process-prereqs.adoc |  78 --
 .../_cg_committers_verifying-releases.adoc      | 304 --------
 .../main/asciidoc/guides/_cg_contributing.adoc  | 255 ------
 .../main/asciidoc/guides/_cg_git-cookbook.adoc  | 258 -------
 .../main/asciidoc/guides/_cg_ide-templates.adoc |  95 ---
 .../src/main/asciidoc/guides/_cg_ide.adoc       |  19 -
 .../main/asciidoc/guides/_cg_ide_agilej.adoc    |  55 --
 .../main/asciidoc/guides/_cg_ide_eclipse.adoc   | 160 ----
 .../main/asciidoc/guides/_cg_ide_intellij.adoc  | 492 ------------
 .../asciidoc/guides/_cg_ide_project-lombok.adoc |  50 --
 .../asciidoc/guides/_cg_isis-maven-plugin.adoc  |  75 --
 .../guides/_cg_isis-maven-plugin_validate.adoc  | 241 ------
 .../guides/_cg_isis-maven-plugin_xsd.adoc       | 329 --------
 .../src/main/asciidoc/guides/_cg_policies.adoc  |  14 -
 .../guides/_cg_policies_git-policy.adoc         |  98 ---
 .../guides/_cg_policies_versioning-policy.adoc  |  35 -
 .../guides/_cgcom-applying-patches.adoc         |  90 +++
 .../guides/_cgcom_cutting-a-release.adoc        | 680 ++++++++++++++++
 .../asciidoc/guides/_cgcom_key-generation.adoc  | 571 ++++++++++++++
 .../guides/_cgcom_merging-a-pull-request.adoc   | 123 +++
 .../main/asciidoc/guides/_cgcom_pmc-notes.adoc  |  71 ++
 .../main/asciidoc/guides/_cgcom_policies.adoc   |  14 +
 .../guides/_cgcom_policies_git-policy.adoc      |  98 +++
 .../_cgcom_policies_versioning-policy.adoc      |  35 +
 .../guides/_cgcom_post-release-successful.adoc  | 438 +++++++++++
 .../_cgcom_post-release-unsuccessful.adoc       |  94 +++
 .../_cgcom_release-process-for-snapshots.adoc   |  88 +++
 .../guides/_cgcom_release-process-prereqs.adoc  |  88 +++
 .../guides/_cgcom_verifying-releases.adoc       | 304 ++++++++
 .../src/main/asciidoc/guides/_dg_agilej.adoc    |  55 ++
 .../asciidoc/guides/_dg_asciidoc-templates.adoc | 741 ++++++++++++++++++
 .../src/main/asciidoc/guides/_dg_asciidoc.adoc  | 205 +++++
 .../main/asciidoc/guides/_dg_building-isis.adoc | 294 +++++++
 .../src/main/asciidoc/guides/_dg_cmd-line.adoc  |   9 +
 .../main/asciidoc/guides/_dg_contributing.adoc  | 255 ++++++
 .../main/asciidoc/guides/_dg_git-cookbook.adoc  | 258 +++++++
 .../main/asciidoc/guides/_dg_ide-templates.adoc |  95 +++
 .../src/main/asciidoc/guides/_dg_ide.adoc       |  17 +
 .../main/asciidoc/guides/_dg_ide_eclipse.adoc   | 160 ++++
 .../main/asciidoc/guides/_dg_ide_intellij.adoc  | 492 ++++++++++++
 .../asciidoc/guides/_dg_project-lombok.adoc     |  50 ++
 .../src/main/asciidoc/guides/_rgant-Action.adoc |  10 +-
 .../guides/_rgant-ActionLayout_named.adoc       |   2 +-
 .../asciidoc/guides/_rgant-Action_command.adoc  |  20 +-
 .../guides/_rgant-Action_domainEvent.adoc       |  10 +-
 .../guides/_rgant-Action_publishing.adoc        |   2 +-
 .../guides/_rgant-Action_semantics.adoc         |   2 +-
 .../main/asciidoc/guides/_rgant-Collection.adoc |   2 +-
 .../guides/_rgant-CollectionLayout_named.adoc   |   2 +-
 .../guides/_rgant-Collection_domainEvent.adoc   |  10 +-
 .../guides/_rgant-Collection_notPersisted.adoc  |   2 +-
 .../asciidoc/guides/_rgant-Discriminator.adoc   |   2 +-
 .../asciidoc/guides/_rgant-DomainObject.adoc    |  34 +-
 .../guides/_rgant-DomainObjectLayout.adoc       |   6 +-
 ...gant-DomainObjectLayout_cssClassUiEvent.adoc |  14 +-
 .../_rgant-DomainObjectLayout_iconUiEvent.adoc  |  14 +-
 .../guides/_rgant-DomainObjectLayout_named.adoc |   2 +-
 .../_rgant-DomainObjectLayout_titleUiEvent.adoc |  14 +-
 .../guides/_rgant-DomainObject_auditing.adoc    |   2 +-
 ...gant-DomainObject_createdLifecycleEvent.adoc |  10 +-
 ...rgant-DomainObject_loadedLifecycleEvent.adoc |   6 +-
 .../guides/_rgant-DomainObject_nature.adoc      |   2 +-
 .../guides/_rgant-DomainObject_objectType.adoc  |   2 +-
 ...nt-DomainObject_persistedLifecycleEvent.adoc |   6 +-
 ...t-DomainObject_persistingLifecycleEvent.adoc |   6 +-
 .../guides/_rgant-DomainObject_publishing.adoc  |   2 +-
 ...ant-DomainObject_removingLifecycleEvent.adoc |   6 +-
 ...gant-DomainObject_updatedLifecycleEvent.adoc |   6 +-
 ...ant-DomainObject_updatingLifecycleEvent.adoc |   6 +-
 .../asciidoc/guides/_rgant-DomainService.adoc   |   2 +-
 .../src/main/asciidoc/guides/_rgant-Inject.adoc |   4 +-
 .../src/main/asciidoc/guides/_rgant-Mixin.adoc  |   2 +-
 .../guides/_rgant-ParameterLayout_named.adoc    |   2 +-
 .../guides/_rgant-Parameter_regexPattern.adoc   |   4 +-
 .../guides/_rgant-PersistenceCapable.adoc       |   2 +-
 .../asciidoc/guides/_rgant-PostConstruct.adoc   |   6 +-
 .../main/asciidoc/guides/_rgant-PreDestroy.adoc |   2 +-
 .../main/asciidoc/guides/_rgant-PrimaryKey.adoc |   2 +-
 .../asciidoc/guides/_rgant-Programmatic.adoc    |   2 +-
 .../main/asciidoc/guides/_rgant-Property.adoc   |   2 +-
 .../guides/_rgant-PropertyLayout_named.adoc     |   2 +-
 .../guides/_rgant-Property_domainEvent.adoc     |   8 +-
 .../guides/_rgant-Property_notPersisted.adoc    |   2 +-
 .../guides/_rgant-Property_regexPattern.adoc    |   6 +-
 .../asciidoc/guides/_rgant-RequestScoped.adoc   |   2 +-
 .../src/main/asciidoc/guides/_rgant-Title.adoc  |   2 +-
 .../main/asciidoc/guides/_rgant-ViewModel.adoc  |   2 +-
 .../guides/_rgant-ViewModelLayout_named.adoc    |   2 +-
 .../guides/_rgant-XmlJavaTypeAdapter.adoc       |   8 +-
 .../asciidoc/guides/_rgant-XmlRootElement.adoc  |  14 +-
 .../main/asciidoc/guides/_rgant_aaa_jee.adoc    |   2 +-
 .../guides/_rgcfg_configuring-core.adoc         |  50 +-
 .../guides/_rgcfg_configuring-datanucleus.adoc  |   2 +-
 .../main/asciidoc/guides/_rgcms_classes.adoc    |   4 +-
 .../guides/_rgcms_classes_domainevent.adoc      |   2 +-
 ...s_classes_domainevent_ActionDomainEvent.adoc |   2 +-
 .../_rgcms_classes_i18n_TranslatableString.adoc |   3 +-
 .../asciidoc/guides/_rgcms_classes_layout.adoc  |  94 +++
 .../guides/_rgcms_classes_lifecycleevent.adoc   |  12 +-
 ...asses_lifecycleevent_ObjectCreatedEvent.adoc |   2 +-
 ...ses_lifecycleevent_ObjectPersistedEvent.adoc |   2 +-
 ...es_lifecycleevent_ObjectPersistingEvent.adoc |   2 +-
 ...sses_lifecycleevent_ObjectRemovingEvent.adoc |   2 +-
 ...asses_lifecycleevent_ObjectUpdatedEvent.adoc |   2 +-
 ...sses_lifecycleevent_ObjectUpdatingEvent.adoc |   2 +-
 .../asciidoc/guides/_rgcms_classes_mixins.adoc  |  16 +
 .../guides/_rgcms_classes_mixins_Dto.adoc       |  62 ++
 .../guides/_rgcms_classes_mixins_Object.adoc    |  74 ++
 .../_rgcms_classes_mixins_Persistable.adoc      |  56 ++
 .../asciidoc/guides/_rgcms_classes_roles.adoc   |   2 -
 .../guides/_rgcms_classes_roles_Dto.adoc        |  61 --
 .../_rgcms_classes_roles_HoldsUpdatedAt.adoc    |   2 +-
 .../_rgcms_classes_roles_Persistable.adoc       |  34 -
 .../asciidoc/guides/_rgcms_classes_super.adoc   |   2 +-
 ...s_classes_super_AbstractContainedObject.adoc |   4 +-
 ...gcms_classes_super_AbstractDomainObject.adoc |   2 +-
 .../_rgcms_classes_super_AbstractService.adoc   |   2 +-
 ..._rgcms_classes_super_AbstractSubscriber.adoc |   6 +-
 .../_rgcms_classes_super_FixtureScripts.adoc    |   4 +-
 .../asciidoc/guides/_rgcms_classes_uievent.adoc |   4 +-
 .../_rgcms_classes_uievent_CssClassUiEvent.adoc |   2 +-
 .../_rgcms_classes_uievent_IconUiEvent.adoc     |   2 +-
 .../_rgcms_classes_uievent_TitleUiEvent.adoc    |   2 +-
 .../guides/_rgcms_methods_lifecycle.adoc        |   2 +-
 .../_rgcms_methods_lifecycle_created.adoc       |   4 +-
 .../_rgcms_methods_lifecycle_jdo-api.adoc       |   4 +-
 .../guides/_rgcms_methods_lifecycle_loaded.adoc |   2 +-
 .../_rgcms_methods_lifecycle_persisted.adoc     |   2 +-
 .../_rgcms_methods_lifecycle_persisting.adoc    |   2 +-
 .../_rgcms_methods_lifecycle_removed.adoc       |   2 +-
 .../_rgcms_methods_lifecycle_removing.adoc      |   2 +-
 .../_rgcms_methods_lifecycle_updated.adoc       |   2 +-
 .../_rgcms_methods_lifecycle_updating.adoc      |   2 +-
 .../guides/_rgcms_methods_prefixes_default.adoc |   4 +-
 .../guides/_rgcms_methods_prefixes_disable.adoc |   2 +-
 .../_rgcms_methods_prefixes_validate.adoc       |   2 +-
 .../_rgcms_methods_prefixes_validateAddTo.adoc  |   2 +-
 ...cms_methods_prefixes_validateRemoveFrom.adoc |   2 +-
 .../guides/_rgcms_methods_reserved_disable.adoc |   2 +-
 .../guides/_rgcms_methods_reserved_title.adoc   |   4 +-
 .../_rgcms_methods_reserved_validate.adoc       |   2 +-
 .../main/asciidoc/guides/_rgcms_schema-aim.adoc |   2 +-
 .../asciidoc/guides/_rgcms_schema-common.adoc   |   2 +-
 .../src/main/asciidoc/guides/_rgmvn_intro.adoc  |  93 +++
 .../main/asciidoc/guides/_rgmvn_swagger.adoc    | 107 +++
 .../main/asciidoc/guides/_rgmvn_validate.adoc   | 241 ++++++
 .../src/main/asciidoc/guides/_rgmvn_xsd.adoc    | 333 ++++++++
 .../src/main/asciidoc/guides/_rgsvc-api.adoc    | 306 --------
 .../_rgsvc-api_ActionInvocationContext.adoc     |  98 ---
 .../guides/_rgsvc-api_BackgroundService.adoc    | 123 ---
 ...roundService_BackgroundCommandExecution.adoc |  25 -
 .../_rgsvc-api_BackgroundService_Quartz.adoc    | 162 ----
 .../guides/_rgsvc-api_BookmarkService.adoc      | 116 ---
 .../_rgsvc-api_BulkInteractionContext.adoc      |   9 -
 .../guides/_rgsvc-api_ClockService.adoc         | 101 ---
 .../guides/_rgsvc-api_CommandContext.adoc       | 216 ------
 .../guides/_rgsvc-api_DeepLinkService.adoc      |  56 --
 .../_rgsvc-api_DomainObjectContainer.adoc       |  40 -
 ...nObjectContainer_generic-repository-api.adoc |  89 ---
 ...-api_DomainObjectContainer_messages-api.adoc |  50 --
 ...mainObjectContainer_object-creation-api.adoc |  49 --
 ...nObjectContainer_object-persistence-api.adoc |  62 --
 ..._DomainObjectContainer_presentation-api.adoc |  46 --
 ...pi_DomainObjectContainer_properties-api.adoc |  54 --
 ...-api_DomainObjectContainer_security-api.adoc |  48 --
 ...-api_DomainObjectContainer_services-api.adoc |  37 -
 ...pi_DomainObjectContainer_validation-api.adoc |  26 -
 .../guides/_rgsvc-api_EmailService.adoc         |  95 ---
 .../guides/_rgsvc-api_EventBusService.adoc      | 405 ----------
 .../_rgsvc-api_FixtureScriptsDefault.adoc       |  50 --
 .../guides/_rgsvc-api_GuiceBeanProvider.adoc    |  91 ---
 .../guides/_rgsvc-api_IsisJdoSupport.adoc       | 276 -------
 .../asciidoc/guides/_rgsvc-api_JaxbService.adoc |  67 --
 .../guides/_rgsvc-api_MementoService.adoc       | 131 ----
 .../guides/_rgsvc-api_MetamodelService.adoc     |  42 -
 .../guides/_rgsvc-api_QueryResultsCache.adoc    | 126 ---
 .../asciidoc/guides/_rgsvc-api_Scratchpad.adoc  | 128 ---
 .../asciidoc/guides/_rgsvc-api_SudoService.adoc |  69 --
 .../guides/_rgsvc-api_WrapperFactory.adoc       | 162 ----
 .../guides/_rgsvc-api_XmlSnapshotService.adoc   | 220 ------
 .../src/main/asciidoc/guides/_rgsvc-spi.adoc    | 299 -------
 .../guides/_rgsvc-spi_AuditingService.adoc      |  85 --
 .../_rgsvc-spi_BackgroundCommandService.adoc    | 131 ----
 .../_rgsvc-spi_ClassDiscoveryService.adoc       |  82 --
 .../guides/_rgsvc-spi_CommandService.adoc       | 100 ---
 .../_rgsvc-spi_ContentMappingService.adoc       | 107 ---
 .../_rgsvc-spi_ContentNegotiationService.adoc   | 204 -----
 .../_rgsvc-spi_EmailNotificationService.adoc    |  81 --
 .../_rgsvc-spi_ErrorReportingService.adoc       | 106 ---
 .../guides/_rgsvc-spi_EventSerializer.adoc      |  74 --
 .../guides/_rgsvc-spi_ExceptionRecognizer.adoc  | 119 ---
 ...spi_FixtureScriptsSpecificationProvider.adoc |  76 --
 .../guides/_rgsvc-spi_LocaleProvider.adoc       |  70 --
 .../guides/_rgsvc-spi_PublishingService.adoc    | 192 -----
 .../_rgsvc-spi_RepresentationService.adoc       | 103 ---
 .../guides/_rgsvc-spi_TranslationService.adoc   |  80 --
 .../guides/_rgsvc-spi_TranslationsResolver.adoc |  67 --
 .../guides/_rgsvc-spi_UrlEncodingService.adoc   |  59 --
 .../guides/_rgsvc-spi_UserProfileService.adoc   |  47 --
 .../_rgsvc-spi_UserRegistrationService.adoc     |  98 ---
 .../guides/_rgsvc_api_AcceptHeaderService.adoc  |  79 ++
 .../_rgsvc_api_ActionInvocationContext.adoc     |  99 +++
 ..._rgsvc_api_ApplicationFeatureRepository.adoc |  59 ++
 .../guides/_rgsvc_api_BackgroundService.adoc    | 123 +++
 ...roundService_BackgroundCommandExecution.adoc |  25 +
 .../_rgsvc_api_BackgroundService_Quartz.adoc    | 162 ++++
 .../guides/_rgsvc_api_BookmarkService.adoc      | 116 +++
 .../_rgsvc_api_BulkInteractionContext.adoc      |   9 +
 .../guides/_rgsvc_api_ClockService.adoc         | 101 +++
 .../guides/_rgsvc_api_CommandContext.adoc       | 216 ++++++
 .../guides/_rgsvc_api_ConfigurationService.adoc |  88 +++
 .../guides/_rgsvc_api_DeepLinkService.adoc      |  56 ++
 .../_rgsvc_api_DomainObjectContainer.adoc       |  51 ++
 ...nObjectContainer_generic-repository-api.adoc |  84 ++
 ..._api_DomainObjectContainer_messages-api.adoc |  45 ++
 ...mainObjectContainer_object-creation-api.adoc |  47 ++
 ...nObjectContainer_object-persistence-api.adoc |  56 ++
 ..._DomainObjectContainer_presentation-api.adoc |  47 ++
 ...pi_DomainObjectContainer_properties-api.adoc |  50 ++
 ..._api_DomainObjectContainer_security-api.adoc |  47 ++
 ..._api_DomainObjectContainer_services-api.adoc |  36 +
 ...pi_DomainObjectContainer_validation-api.adoc |  29 +
 .../guides/_rgsvc_api_EmailService.adoc         |  95 +++
 .../guides/_rgsvc_api_EventBusService.adoc      | 405 ++++++++++
 .../guides/_rgsvc_api_FactoryService.adoc       |  79 ++
 .../_rgsvc_api_FixtureScriptsDefault.adoc       |  50 ++
 .../guides/_rgsvc_api_GuiceBeanProvider.adoc    |  91 +++
 .../_rgsvc_api_HomePageProviderService.adoc     |  40 +
 .../guides/_rgsvc_api_IsisJdoSupport.adoc       | 276 +++++++
 .../asciidoc/guides/_rgsvc_api_JaxbService.adoc |  68 ++
 .../guides/_rgsvc_api_LayoutService.adoc        | 107 +++
 .../guides/_rgsvc_api_MementoService.adoc       | 131 ++++
 .../guides/_rgsvc_api_MessageService.adoc       |  78 ++
 .../guides/_rgsvc_api_MetamodelService.adoc     |  55 ++
 .../guides/_rgsvc_api_QueryResultsCache.adoc    | 126 +++
 .../guides/_rgsvc_api_RepositoryService.adoc    | 189 +++++
 .../asciidoc/guides/_rgsvc_api_Scratchpad.adoc  | 128 +++
 .../guides/_rgsvc_api_ServiceRegistry.adoc      |  72 ++
 .../_rgsvc_api_SessionManagementService.adoc    |  56 ++
 .../asciidoc/guides/_rgsvc_api_SudoService.adoc |  69 ++
 .../guides/_rgsvc_api_SwaggerService.adoc       |  69 ++
 .../guides/_rgsvc_api_TitleService.adoc         |  74 ++
 .../guides/_rgsvc_api_TransactionService.adoc   |  65 ++
 .../asciidoc/guides/_rgsvc_api_UserService.adoc |  83 ++
 .../guides/_rgsvc_api_WrapperFactory.adoc       | 162 ++++
 .../guides/_rgsvc_api_XmlSnapshotService.adoc   | 219 ++++++
 .../guides/_rgsvc_application-layer-api.adoc    | 144 ++++
 .../guides/_rgsvc_application-layer-spi.adoc    |  77 ++
 .../guides/_rgsvc_bootstrapping-spi.adoc        |  40 +
 .../asciidoc/guides/_rgsvc_core-domain-api.adoc | 155 ++++
 .../asciidoc/guides/_rgsvc_integration-api.adoc | 112 +++
 .../src/main/asciidoc/guides/_rgsvc_intro.adoc  | 139 ++++
 .../asciidoc/guides/_rgsvc_metadata-api.adoc    |  89 +++
 .../guides/_rgsvc_persistence-layer-api.adoc    |  74 ++
 .../guides/_rgsvc_persistence-layer-spi.adoc    | 102 +++
 .../_rgsvc_presentation-layer-internal-spi.adoc |  66 ++
 .../guides/_rgsvc_presentation-layer-spi.adoc   | 203 +++++
 .../guides/_rgsvc_spi_AuditingService.adoc      |  85 ++
 .../_rgsvc_spi_BackgroundCommandService.adoc    | 131 ++++
 .../_rgsvc_spi_ClassDiscoveryService.adoc       |  82 ++
 .../guides/_rgsvc_spi_CommandService.adoc       | 100 +++
 .../_rgsvc_spi_ContentMappingService.adoc       | 102 +++
 .../_rgsvc_spi_ContentNegotiationService.adoc   | 204 +++++
 .../_rgsvc_spi_EmailNotificationService.adoc    |  81 ++
 .../_rgsvc_spi_ErrorReportingService.adoc       | 106 +++
 .../guides/_rgsvc_spi_EventSerializer.adoc      |  74 ++
 .../guides/_rgsvc_spi_ExceptionRecognizer.adoc  | 119 +++
 ...spi_FixtureScriptsSpecificationProvider.adoc |  76 ++
 .../guides/_rgsvc_spi_GridLoaderService.adoc    |  53 ++
 .../asciidoc/guides/_rgsvc_spi_GridService.adoc |  72 ++
 .../guides/_rgsvc_spi_GridSystemService.adoc    |  75 ++
 .../asciidoc/guides/_rgsvc_spi_HintStore.adoc   |  63 ++
 .../guides/_rgsvc_spi_LocaleProvider.adoc       |  70 ++
 .../guides/_rgsvc_spi_PublishingService.adoc    | 192 +++++
 .../_rgsvc_spi_RepresentationService.adoc       | 103 +++
 .../guides/_rgsvc_spi_RoutingService.adoc       |  79 ++
 .../guides/_rgsvc_spi_TranslationService.adoc   |  87 +++
 .../guides/_rgsvc_spi_TranslationsResolver.adoc |  67 ++
 .../guides/_rgsvc_spi_UrlEncodingService.adoc   |  59 ++
 .../guides/_rgsvc_spi_UserProfileService.adoc   |  47 ++
 .../_rgsvc_spi_UserRegistrationService.adoc     |  98 +++
 .../main/asciidoc/guides/_rgsvc_testing.adoc    |  89 +++
 .../main/asciidoc/guides/_tg_pet-clinic.adoc    |   4 +-
 .../_tg_stop-scaffolding-start-coding.adoc      |  20 +-
 .../main/asciidoc/guides/_ugbtb_decoupling.adoc |  28 +
 .../guides/_ugbtb_decoupling_contributions.adoc |  23 +
 .../guides/_ugbtb_decoupling_db-schemas.adoc    | 141 ++++
 .../guides/_ugbtb_decoupling_event-bus.adoc     |  11 +
 .../guides/_ugbtb_decoupling_mixins.adoc        | 191 +++++
 .../_ugbtb_decoupling_pushing-changes.adoc      | 140 ++++
 .../_ugbtb_decoupling_vetoing-visibility.adoc   |  15 +
 .../guides/_ugbtb_deployment_tomcat.adoc        |   2 +-
 .../asciidoc/guides/_ugbtb_headless-access.adoc |  27 +
 ...less-access_AbstractIsisSessionTemplate.adoc |  40 +
 ...dless-access_BackgroundCommandExecution.adoc |  45 ++
 .../src/main/asciidoc/guides/_ugbtb_i18n.adoc   | 671 ++++++++++++++++
 .../asciidoc/guides/_ugbtb_more-advanced.adoc   |  26 -
 .../guides/_ugbtb_more-advanced_decoupling.adoc |  28 -
 ..._more-advanced_decoupling_contributions.adoc |  23 -
 ...btb_more-advanced_decoupling_db-schemas.adoc | 141 ----
 ...gbtb_more-advanced_decoupling_event-bus.adoc |  11 -
 .../_ugbtb_more-advanced_decoupling_mixins.adoc | 191 -----
 ...ore-advanced_decoupling_pushing-changes.adoc | 140 ----
 ...-advanced_decoupling_vetoing-visibility.adoc |  15 -
 .../_ugbtb_more-advanced_headless-access.adoc   |  27 -
 ...less-access_AbstractIsisSessionTemplate.adoc |  40 -
 ...dless-access_BackgroundCommandExecution.adoc |  45 --
 .../guides/_ugbtb_more-advanced_i18n.adoc       | 378 ---------
 ...ugbtb_more-advanced_mapping-rdbms-views.adoc |   9 -
 .../_ugbtb_more-advanced_multi-tenancy.adoc     |   8 -
 ...ore-advanced_overriding-jdo-annotations.adoc |  64 --
 .../_ugbtb_more-advanced_persisted-title.adoc   |  82 --
 ...placing-default-service-implementations.adoc |  64 --
 ...b_more-advanced_transactions-and-errors.adoc |  33 -
 .../_ugbtb_more-advanced_view-models.adoc       |  19 -
 .../_ugbtb_more-advanced_view-models_jaxb.adoc  | 240 ------
 ...-advanced_view-models_programming-model.adoc |  87 ---
 ...btb_more-advanced_view-models_use-cases.adoc | 142 ----
 .../guides/_ugbtb_other-techniques.adoc         |  22 +
 ...tb_other-techniques_mapping-rdbms-views.adoc |   9 +
 .../_ugbtb_other-techniques_multi-tenancy.adoc  |   8 +
 ...r-techniques_overriding-jdo-annotations.adoc |  64 ++
 ..._ugbtb_other-techniques_persisted-title.adoc |  82 ++
 ...placing-default-service-implementations.adoc |  64 ++
 ...ther-techniques_transactions-and-errors.adoc |  33 +
 .../guides/_ugbtb_programming-model.adoc        |   2 +-
 ...gbtb_programming-model_custom-validator.adoc |   2 +-
 .../_ugbtb_programming-model_finetuning.adoc    |   2 +-
 ...rogramming-model_layout-metadata-reader.adoc |  10 +
 .../asciidoc/guides/_ugbtb_view-models.adoc     |  19 +
 .../guides/_ugbtb_view-models_jaxb.adoc         | 432 +++++++++++
 .../_ugbtb_view-models_programming-model.adoc   |  87 +++
 .../guides/_ugbtb_view-models_use-cases.adoc    | 160 ++++
 .../main/asciidoc/guides/_ugbtb_web-xml.adoc    |  25 +-
 .../_ugfun_core-concepts_building-blocks.adoc   |  14 +-
 ...re-concepts_framework-provided-services.adoc |  46 +-
 ..._core-concepts_other-deployment-options.adoc |   2 +-
 .../_ugfun_core-concepts_philosophy_aop.adoc    |   4 +-
 ...concepts_principles_apache-isis-vs_cqrs.adoc |   6 +-
 ...rinciples_apache-isis-vs_event-sourcing.adoc |   2 +-
 .../src/main/asciidoc/guides/_ugfun_faqs.adoc   |   3 +
 ...un_faqs_how-run-fixtures-on-app-startup.adoc |  20 +
 ...aqs_how-to-handle-void-and-null-results.adoc |  80 ++
 ...un_faqs_how-to-implement-a-spellchecker.adoc |  30 +
 ..._ugfun_faqs_i18n-label-in-wicket-viewer.adoc |  18 +-
 .../guides/_ugfun_faqs_per-user-themes.adoc     |   2 +-
 .../_ugfun_faqs_restful-image-property.adoc     |   7 +-
 ...faqs_subtype-entity-not-fully-populated.adoc |   7 +-
 .../asciidoc/guides/_ugfun_getting-started.adoc |   2 +-
 ...un_getting-started_datanucleus-enhancer.adoc |   2 +-
 ...fun_getting-started_simpleapp-archetype.adoc |  58 +-
 .../guides/_ugfun_how-tos_class-structure.adoc  |   2 +-
 ...ow-tos_class-structure_class-definition.adoc |   2 +-
 .../asciidoc/guides/_ugfun_how-tos_crud.adoc    |   8 +-
 .../guides/_ugfun_how-tos_domain-services.adoc  |   9 +-
 ...how-tos_ui-hints_names-and-descriptions.adoc |   2 +-
 .../asciidoc/guides/_ugfun_object-layout.adoc   |   1 +
 .../_ugfun_object-layout_application-menu.adoc  |   2 +-
 .../guides/_ugfun_object-layout_dynamic.adoc    |  42 +-
 .../_ugfun_object-layout_dynamic_xml.adoc       | 401 ++++++++++
 .../guides/_ugfun_object-layout_static.adoc     |  49 +-
 .../guides/_ugsec_api-for-applications.adoc     |   2 +-
 .../_ugsec_configuring-isis-to-use-bypass.adoc  |   2 +-
 .../asciidoc/guides/_ugsec_shiro-ini-realm.adoc |   2 +-
 .../guides/_ugsec_shiro-isis-ldap-realm.adoc    |   2 +-
 ..._shiro-isisaddons-security-module-realm.adoc |   4 +-
 .../guides/_ugsec_usage-by-isis-viewers.adoc    |  14 +-
 .../src/main/asciidoc/guides/_ugtst_aaa.adoc    |   2 +-
 .../_ugtst_fixture-scripts_api-and-usage.adoc   |   6 +-
 ..._ugtst_integ-test-support_bootstrapping.adoc |   2 +-
 ...gtst_integ-test-support_wrapper-factory.adoc |   4 +-
 ..._ugtst_unit-test-support_contract-tests.adoc |   2 +-
 .../asciidoc/guides/_ugvro_architecture.adoc    |   9 +-
 .../guides/_ugvro_configuration-properties.adoc | 147 +++-
 .../main/asciidoc/guides/_ugvro_ro-spec.adoc    |   2 +-
 .../_ugvro_simplified-representations.adoc      |  39 +-
 ...epresentations_configuration-properties.adoc | 121 +--
 .../guides/_ugvw_configuration-properties.adoc  |  17 +-
 ...ugvw_customisation_tweaking-css-classes.adoc | 151 +++-
 .../guides/_ugvw_extending_custom-pages.adoc    |   4 +-
 .../_ugvw_features_user-registration.adoc       |  10 +-
 .../src/main/asciidoc/guides/_ugvw_layout.adoc  |  85 +-
 .../src/main/asciidoc/guides/cg.adoc            |  63 --
 .../src/main/asciidoc/guides/cgcom.adoc         |  63 ++
 .../src/main/asciidoc/guides/dg.adoc            |  66 ++
 .../acceptheaderservice.png                     | Bin 0 -> 10997 bytes
 .../acceptheaderservice.pptx                    | Bin 0 -> 46935 bytes
 .../images/reference-services/categories.png    | Bin 0 -> 31453 bytes
 .../images/reference-services/categories.pptx   | Bin 0 -> 63438 bytes
 .../ToDoAppDashboard.png                        | Bin 0 -> 124848 bytes
 .../ToDoItem.png                                | Bin 0 -> 91690 bytes
 .../src/main/asciidoc/guides/rg.adoc            |  27 -
 .../src/main/asciidoc/guides/rgant.adoc         |  13 +-
 .../src/main/asciidoc/guides/rgcfg.adoc         |   9 +-
 .../src/main/asciidoc/guides/rgcms.adoc         |  11 +-
 .../src/main/asciidoc/guides/rgmvn.adoc         |  51 ++
 .../src/main/asciidoc/guides/rgsvc.adoc         |  35 +-
 .../asciidoc/guides/simpleapp-archetype.adoc    | 207 -----
 .../src/main/asciidoc/guides/ug.adoc            |  27 -
 .../src/main/asciidoc/guides/ugbtb.adoc         |  17 +-
 .../src/main/asciidoc/guides/ugfun.adoc         |   9 +-
 .../src/main/asciidoc/guides/ugsec.adoc         |  11 +-
 .../src/main/asciidoc/guides/ugtst.adoc         |   9 +-
 .../src/main/asciidoc/guides/ugvro.adoc         |   9 +-
 .../src/main/asciidoc/guides/ugvw.adoc          |   5 +-
 adocs/documentation/src/main/asciidoc/help.adoc |   2 +-
 .../src/main/asciidoc/images/PDF-50.png         | Bin 0 -> 587 bytes
 .../images/isis-in-pictures/010-login.png       | Bin 53308 -> 52503 bytes
 .../isis-in-pictures/020-install-fixtures.png   | Bin 84507 -> 98880 bytes
 .../030-dashboard-view-model.png                | Bin 118239 -> 124043 bytes
 .../isis-in-pictures/040-domain-entity.png      | Bin 100818 -> 87866 bytes
 .../isis-in-pictures/050-edit-property.png      | Bin 97649 -> 96607 bytes
 .../isis-in-pictures/060-invoke-action.png      | Bin 118082 -> 104578 bytes
 .../isis-in-pictures/065-contributions.png      | Bin 108489 -> 88063 bytes
 .../isis-in-pictures/067-contributed-action.png | Bin 25914 -> 20163 bytes
 .../main/asciidoc/images/todoapp/dashboard.png  | Bin 0 -> 137248 bytes
 .../main/asciidoc/images/todoapp/todoitem.png   | Bin 0 -> 98559 bytes
 .../documentation/src/main/asciidoc/index.html  |  99 ++-
 .../src/main/asciidoc/isis-in-pictures.adoc     |  20 +-
 .../src/main/asciidoc/migration-notes.adoc      |   1 +
 .../documentation/src/main/asciidoc/quotes.adoc | 191 +++++
 .../src/main/asciidoc/release-notes.adoc        |  31 +-
 ...-settings-file-templates-for-apache-isis.jar | Bin 9104 -> 9105 bytes
 .../templates/isis-asciidoc-templates-idea.xml  |  18 +-
 .../resources/templates/isis-template-idea.xml  | 522 -------------
 .../resources/templates/isis-templates-idea.xml | 522 +++++++++++++
 .../src/main/asciidoc/screencasts.adoc          |  26 +-
 adocs/template/document.html.erb                |  18 +-
 core/applib/pom.xml                             |   6 +-
 .../isis/applib/DomainObjectContainer.java      | 331 +++-----
 .../java/org/apache/isis/applib/ViewModel.java  |   4 +-
 .../isis/applib/annotation/ActionLayout.java    |   8 +
 .../isis/applib/annotation/BookmarkPolicy.java  |   5 +
 .../applib/annotation/CollectionLayout.java     |   7 +-
 .../isis/applib/annotation/Contributed.java     |   5 +
 .../applib/annotation/DomainObjectLayout.java   |   2 +-
 .../isis/applib/annotation/LabelPosition.java   |   5 +
 .../isis/applib/annotation/RenderType.java      |   9 +
 .../apache/isis/applib/annotation/Where.java    |   5 +
 .../isis/applib/annotation/package-info.java    |  31 -
 .../applib/conmap/ContentMappingService.java    |  35 +
 .../applib/fixturescripts/FixtureScript.java    |  12 +
 .../org/apache/isis/applib/layout/Util.java     |  49 ++
 .../layout/component/ActionLayoutData.java      | 253 ++++++
 .../layout/component/ActionLayoutDataOwner.java |  26 +
 .../layout/component/CollectionLayoutData.java  | 269 +++++++
 .../component/CollectionLayoutDataOwner.java    |  26 +
 .../component/DomainObjectLayoutData.java       | 208 +++++
 .../component/DomainObjectLayoutDataOwner.java  |  25 +
 .../isis/applib/layout/component/FieldSet.java  | 223 ++++++
 .../applib/layout/component/FieldSetOwner.java  |  25 +
 .../isis/applib/layout/component/Grid.java      |  90 +++
 .../applib/layout/component/GridAbstract.java   | 197 +++++
 .../applib/layout/component/HasBookmarking.java |  29 +
 .../applib/layout/component/HasCssClass.java    |  27 +
 .../applib/layout/component/HasCssClassFa.java  |  35 +
 .../applib/layout/component/HasDescribedAs.java |  29 +
 .../isis/applib/layout/component/HasHidden.java |  31 +
 .../isis/applib/layout/component/HasNamed.java  |  34 +
 .../applib/layout/component/MemberRegion.java   |  33 +
 .../layout/component/MemberRegionOwner.java     |  23 +
 .../isis/applib/layout/component/Owned.java     |  23 +
 .../isis/applib/layout/component/Owner.java     |  24 +
 .../layout/component/PropertyLayoutData.java    | 254 ++++++
 .../applib/layout/component/package-info.java   |  36 +
 .../layout/grid/bootstrap3/BS3ClearFix.java     |  24 +
 .../grid/bootstrap3/BS3ClearFixHidden.java      |  49 ++
 .../grid/bootstrap3/BS3ClearFixVisible.java     |  73 ++
 .../applib/layout/grid/bootstrap3/BS3Col.java   | 273 +++++++
 .../layout/grid/bootstrap3/BS3Element.java      |  35 +
 .../grid/bootstrap3/BS3ElementAbstract.java     |  46 ++
 .../applib/layout/grid/bootstrap3/BS3Grid.java  | 304 ++++++++
 .../applib/layout/grid/bootstrap3/BS3Row.java   | 140 ++++
 .../layout/grid/bootstrap3/BS3RowContent.java   |  80 ++
 .../grid/bootstrap3/BS3RowContentOwner.java     |  25 +
 .../layout/grid/bootstrap3/BS3RowOwner.java     |  28 +
 .../applib/layout/grid/bootstrap3/BS3Tab.java   | 177 +++++
 .../layout/grid/bootstrap3/BS3TabGroup.java     | 123 +++
 .../grid/bootstrap3/BS3TabGroupOwner.java       |  28 +
 .../layout/grid/bootstrap3/BS3TabOwner.java     |  28 +
 .../applib/layout/grid/bootstrap3/HasCssId.java |  28 +
 .../applib/layout/grid/bootstrap3/Size.java     |  34 +
 .../applib/layout/grid/bootstrap3/SizeSpan.java | 103 +++
 .../layout/grid/bootstrap3/WithinGrid.java      |  27 +
 .../layout/grid/bootstrap3/package-info.java    |  34 +
 .../acceptheader/AcceptHeaderService.java       |  32 +
 .../appfeat/ApplicationFeatureRepository.java   |  42 +
 .../services/appfeat/ApplicationMemberType.java |  42 +
 .../services/config/ConfigurationProperty.java  |  87 +++
 .../config/ConfigurationProperty.layout.xml     |  58 ++
 .../services/config/ConfigurationProperty.png   | Bin 0 -> 927 bytes
 .../services/config/ConfigurationService.java   |  54 ++
 .../config/ConfigurationServiceMenu.java        |  67 ++
 .../applib/services/dto/Dto_downloadXml.java    |  10 +-
 .../applib/services/dto/Dto_downloadXsd.java    |   6 +-
 .../applib/services/factory/FactoryService.java |  62 ++
 .../applib/services/grid/GridLoaderService.java |  48 ++
 .../isis/applib/services/grid/GridService.java  | 108 +++
 .../applib/services/grid/GridSystemService.java |  55 ++
 .../isis/applib/services/hint/HintStore.java    |  43 ++
 .../homepage/HomePageProviderService.java       |  43 ++
 .../jaxb/CatalogingSchemaOutputResolver.java    | 152 ++++
 .../isis/applib/services/jaxb/JaxbService.java  | 199 ++++-
 .../services/jaxb/StreamResultWithWriter.java   |  45 ++
 .../applib/services/layout/LayoutService.java   |  80 ++
 .../services/layout/LayoutServiceMenu.java      |  91 +++
 .../layout/Object_downloadLayoutXml.java        |  74 ++
 .../layout/Object_rebuildMetamodel.java         |  58 ++
 .../isis/applib/services/layout/Util.java       |  33 +
 .../applib/services/message/MessageService.java | 112 +++
 .../applib/services/metamodel/DomainMember.java |  54 ++
 .../services/metamodel/MetaModelService.java    |  15 +
 .../metamodel/MetaModelServicesMenu.java        | 146 ++++
 .../isis/applib/services/metamodel/Util.java    |  33 +
 .../services/registry/ServiceRegistry.java      |  36 +
 .../services/repository/RepositoryService.java  | 216 ++++++
 .../applib/services/routing/RoutingService.java |  34 +
 .../services/routing/RoutingServiceDefault.java |  58 ++
 .../sessmgmt/SessionManagementService.java      |  44 ++
 .../applib/services/swagger/SwaggerService.java |  22 +-
 .../services/swagger/SwaggerServiceMenu.java    |   4 +-
 .../applib/services/title/TitleService.java     |  41 +
 .../isis/applib/services/user/UserService.java  |  33 +
 .../services/xactn/TransactionService.java      |  42 +
 .../java/org/apache/isis/applib/value/Blob.java |  10 +-
 .../java/org/apache/isis/applib/value/Clob.java |  10 +-
 .../layout/grid/bootstrap3/BS3ColTest.java      |  63 ++
 .../layout/grid/bootstrap3/SizeSpanTest.java    |  62 ++
 core/integtestsupport/pom.xml                   |   2 +-
 .../integtestsupport/IsisSystemForTest.java     |  85 +-
 core/log4j/pom.xml                              |   2 +-
 core/maven-plugin/pom.xml                       |  56 +-
 .../isis/tool/mavenplugin/IsisMojoAbstract.java |  17 +-
 .../isis/tool/mavenplugin/IsisMojoSwagger.java  | 134 ++++
 .../isis/tool/mavenplugin/IsisMojoXsd.java      |  10 +-
 core/metamodel/pom.xml                          |   9 +-
 .../isis/core/commons/lang/ArrayExtensions.java |  16 +-
 .../isis/core/commons/lang/ClassExtensions.java |  12 +-
 .../core/metamodel/adapter/ObjectAdapter.java   |  18 +-
 .../isis/core/metamodel/facetapi/FacetUtil.java |  26 +-
 .../facetdecorator/FacetDecoratorSet.java       |  11 +-
 .../isis/core/metamodel/facets/Annotations.java |  14 +-
 .../invocation/ActionInvocationFacet.java       |  42 +-
 ...onInvocationFacetForDomainEventAbstract.java |  73 +-
 .../layout/ActionLayoutFacetFactory.java        |   6 +-
 .../layout/ActionPositionFacetForActionXml.java |  41 +
 .../layout/BookmarkPolicyFacetForActionXml.java |  42 +
 .../layout/CssClassFaFacetForActionXml.java     |  45 ++
 .../layout/CssClassFacetForActionXml.java       |  43 ++
 .../layout/DescribedAsFacetForActionXml.java    |  43 ++
 .../layout/HiddenFacetForActionLayoutXml.java   |  52 ++
 .../actions/layout/NamedFacetForActionXml.java  |  45 ++
 .../all/i18n/TranslationFacetFactory.java       |   7 +-
 ...tViewFacetForCollectionLayoutAnnotation.java |  41 -
 ...ewFacetOnCollectionFromLayoutProperties.java |  46 --
 .../layout/CollectionLayoutFacetFactory.java    |   2 -
 .../layout/CssClassFacetForCollectionXml.java   |  43 ++
 ...tViewFacetForCollectionLayoutAnnotation.java |  43 ++
 .../DefaultViewFacetForCollectionXml.java       |  43 ++
 ...ewFacetOnCollectionFromLayoutProperties.java |  48 ++
 .../DescribedAsFacetForCollectionXml.java       |  43 ++
 .../layout/HiddenFacetForCollectionXml.java     |  52 ++
 .../layout/NamedFacetForCollectionXml.java      |  48 ++
 .../layout/PagedFacetForCollectionXml.java      |  41 +
 .../layout/SortedByFacetForCollectionXml.java   |  52 ++
 .../members/cssclassfa/CssClassFaPosition.java  |  24 +
 .../facets/members/order/MemberOrderFacet.java  |   4 +
 .../members/order/MemberOrderFacetAbstract.java |   6 +
 .../order/annotprop/MemberOrderFacetXml.java    |  35 +
 .../object/autocomplete/AutoCompleteFacet.java  |   3 +-
 .../autocomplete/AutoCompleteFacetAbstract.java |  51 +-
 .../BookmarkPolicyFacetForDomainObjectXml.java  |  42 +
 .../CssClassFaFacetForDomainObjectXml.java      |  45 ++
 .../CssClassFacetForDomainObjectXml.java        |  43 ++
 .../DescribedAsFacetForDomainObjectXml.java     |  43 ++
 .../NamedFacetForDomainObjectXml.java           |  45 ++
 .../PluralFacetForDomainObjectXml.java          |  41 +
 .../DomainServiceLayoutFacetFactory.java        |  84 ++
 .../DomainServiceLayoutFactory.java             |  84 --
 .../metamodel/facets/object/grid/GridFacet.java |  40 +
 .../facets/object/grid/GridFacetDefault.java    |  83 ++
 .../facets/object/grid/GridFacetFactory.java    |  54 ++
 ...nCollectionDerivedFromRecreatableObject.java |   3 +-
 ...eObjectFacetForXmlRootElementAnnotation.java |  13 +
 .../param/autocomplete/MinLengthUtil.java       |   4 +
 .../CssClassFacetForPropertyXml.java            |  43 ++
 .../DescribedAsFacetForPropertyXml.java         |  43 ++
 .../HiddenFacetForPropertyXml.java              |  52 ++
 .../LabelAtFacetForPropertyXml.java             |  42 +
 .../MultiLineFacetForPropertyXml.java           |  41 +
 .../NamedFacetForPropertyXml.java               |  48 ++
 .../RenderedAdjustedFacetForPropertyXml.java    |  43 ++
 .../TypicalLengthFacetForPropertyXml.java       |  49 ++
 .../layoutmetadata/LayoutMetadataReader2.java   |   2 +-
 .../json/LayoutMetadataReaderFromJson.java      |  43 +-
 .../PersistenceSessionService.java              |   4 +-
 .../noruntime/RuntimeContextNoRuntime.java      |   6 +
 .../services/appfeat/ApplicationFeature.java    | 351 +++++++++
 .../appfeat/ApplicationFeatureFactory.java      |  39 +
 .../services/appfeat/ApplicationFeatureId.java  | 473 ++++++++++++
 .../ApplicationFeatureRepositoryDefault.java    | 539 +++++++++++++
 .../appfeat/ApplicationFeatureType.java         | 102 +++
 .../config/ConfigurationServiceDefault.java     |  93 +++
 .../container/DomainObjectContainerDefault.java | 359 +++------
 .../metamodel/services/devutils/MemberType.java |  25 +
 .../services/factory/FactoryServiceDefault.java | 111 +++
 .../services/grid/GridLoaderServiceDefault.java | 209 +++++
 .../services/grid/GridNormalizerUtil.java       |  38 +
 .../services/grid/GridServiceDefault.java       | 203 +++++
 .../grid/GridSystemServiceAbstract.java         | 708 +++++++++++++++++
 .../grid/bootstrap3/GridSystemServiceBS3.java   | 677 ++++++++++++++++
 .../services/grid/fixedcols/applib/Hint.java    |  39 +
 .../Persistable_datanucleusIdLong.java          |  73 ++
 .../Persistable_datanucleusVersionLong.java     |  66 ++
 ...Persistable_datanucleusVersionTimestamp.java |  66 ++
 .../Persistable_downloadJdoMetadata.java        |  41 +-
 .../services/layout/LayoutServiceDefault.java   | 161 ++++
 .../services/message/MessageServiceDefault.java |  87 +++
 .../services/metamodel/DomainMemberDefault.java | 247 ++++++
 .../metamodel/MetaModelServiceDefault.java      | 102 ++-
 .../core/metamodel/services/metamodel/Util.java |  33 +
 .../registry/ServiceRegistryDefault.java        |  72 ++
 .../repository/RepositoryServiceDefault.java    | 256 ++++++
 .../services/swagger/SwaggerServiceDefault.java |   2 +
 .../services/swagger/internal/Generation.java   |  40 +-
 .../services/swagger/internal/Util.java         |   8 +-
 .../swagger/internal/ValuePropertyFactory.java  |  22 +
 .../services/title/TitleServiceDefault.java     |  91 +++
 .../services/user/UserServiceDefault.java       | 140 ++++
 .../xactn/TransactionServiceDefault.java        |  51 ++
 .../metamodel/spec/ObjectSpecifications.java    |  24 +-
 .../metamodel/spec/SpecificationLoaderSpi.java  |   2 -
 .../metamodel/spec/feature/ObjectAction.java    |   7 +-
 .../spec/feature/ObjectAssociation.java         |  65 +-
 .../metamodel/spec/feature/ObjectMember.java    |  66 ++
 .../specloader/ObjectReflectorDefault.java      |  36 +-
 .../specloader/SpecificationCacheDefault.java   |  31 +-
 .../specimpl/FacetedMethodsBuilder.java         |   7 +-
 .../specloader/specimpl/MixedInMember2.java     |  28 +
 .../specimpl/ObjectActionContributee.java       |   2 +-
 .../specimpl/ObjectActionMixedIn.java           |  10 +-
 .../specimpl/ObjectSpecificationAbstract.java   |  11 +-
 .../specimpl/OneToManyAssociationMixedIn.java   |  12 +-
 .../specimpl/OneToOneAssociationMixedIn.java    |  13 +-
 .../dflt/ObjectSpecificationDefault.java        |  13 +-
 .../metamodel/util/DeweyOrderComparator.java    |  82 ++
 .../dflt/ProgrammingModelFacetsJava5.java       |   7 +-
 .../metamodel/facets/ProgrammableReflector.java |   3 -
 .../ActionLayoutAnnotationFacetFactoryTest.java | 192 -----
 ...youtXmlLayoutAnnotationFacetFactoryTest.java | 192 +++++
 .../DomainServiceLayoutFacetFactoryTest.java    | 129 ++++
 .../DomainServiceLayoutFactoryTest.java         | 129 ----
 .../object/layoutxml/GridFacetDefaultTest.java  |  60 ++
 ...inObjectContainerDefaultTest_allMatches.java | 112 ---
 .../metamodel/services/grid/BS3GridTest.java    | 164 ++++
 ...RepositoryServiceDefaultTest_allMatches.java | 100 +++
 .../SpecificationCacheDefaultTest.java          |  21 +-
 core/pom.xml                                    | 246 ++++--
 core/runtime/pom.xml                            |  28 +-
 .../internal/RuntimeContextFromSession.java     |   5 +
 ...shingServiceWithDefaultPayloadFactories.java |   2 +-
 .../core/runtime/runner/IsisInjectModule.java   |  14 +-
 .../opts/OptionHandlerSystemProperties.java     |   2 +-
 .../runtime/services/DeweyOrderComparator.java  |  82 --
 .../ServicesInstallerFromAnnotation.java        |   7 +-
 .../ServicesInstallerFromConfiguration.java     |   1 +
 ...InstallerFromConfigurationAndAnnotation.java |   1 +
 .../HomePageProviderServiceDefault.java         | 108 +++
 .../core/runtime/services/i18n/po/PoReader.java |  16 +-
 .../core/runtime/services/i18n/po/PoWriter.java |  39 +-
 .../services/i18n/po/TranslationServicePo.java  |   4 +-
 .../i18n/po/TranslationServicePoMenu.java       |  15 +-
 .../core/runtime/services/i18n/po/Util.java     |  33 +
 .../SessionManagementServiceDefault.java        |  47 ++
 .../services/sudo/SudoServiceDefault.java       |  34 +-
 .../core/runtime/system/ContextCategory.java    |  79 --
 .../core/runtime/system/DeploymentType.java     |  38 +-
 .../isis/core/runtime/system/IsisSystem.java    |  69 +-
 .../core/runtime/system/IsisSystemFactory.java  |   4 +-
 .../runtime/system/context/IsisContext.java     | 173 ++++-
 .../system/context/IsisContextStatic.java       | 137 ----
 .../system/context/IsisContextThreadLocal.java  | 183 -----
 .../system/persistence/PersistenceSession.java  |   5 +
 .../persistence/PersistenceSessionFactory.java  |  21 +-
 .../system/transaction/IsisTransaction.java     |  42 +-
 .../isis/core/webapp/IsisSessionFilter.java     |  66 +-
 .../core/webapp/IsisWebAppBootstrapper.java     |  25 +-
 .../core/runtime/context/IsisContextTest.java   | 140 ----
 .../services/DeweyOrderComparatorTest.java      |   2 +
 .../services/i18n/po/PoWriterTest_escape.java   |  44 ++
 .../runtime/system/ObjectActionDefaultTest.java | 107 ---
 .../ObjectActionLayoutXmlDefaultTest.java       | 107 +++
 core/schema/pom.xml                             |   2 +-
 .../jaxb/CatalogingSchemaOutputResolver.java    |  85 --
 .../services/jaxb/JaxbServiceDefault.java       | 111 +--
 .../services/jaxb/StreamResultWithWriter.java   |  45 --
 core/security-shiro/pom.xml                     |   6 +-
 core/security/pom.xml                           |   2 +-
 core/specsupport/pom.xml                        |   2 +-
 .../scenarios/ScenarioExecution.java            |   3 +-
 .../specsupport/specs/CukeGlueAbstract.java     |  23 +-
 .../specsupport/specs/CukeSpecsAbstract.java    |   7 +-
 .../appended-resources/supplemental-models.xml  |  17 +-
 core/unittestsupport/pom.xml                    |   4 +-
 .../soap/PublishedEndpoints.java                |   2 +-
 .../core/unittestsupport/soap/SoapEndpoint.java |   2 +-
 .../unittestsupport/soap/SoapEndpointSpec.java  |   3 +-
 core/viewer-restfulobjects-applib/pom.xml       |   2 +-
 core/viewer-restfulobjects-rendering/pom.xml    |   2 +-
 .../domainobjects/ActionResultReprRenderer.java |   2 +-
 .../rendering/domainobjects/MemberType.java     |  28 +-
 .../ObjectPropertyReprRenderer.java             |   2 +-
 .../RepresentationServiceContentNegotiator.java |   3 +-
 .../AcceptHeaderServiceForRest.java             | 106 +++
 .../service/conmap/ContentMappingService.java   |   7 +-
 .../ContentNegotiationServiceAbstract.java      |   3 -
 .../ContentNegotiationServiceXRoDomainType.java |  65 +-
 core/viewer-restfulobjects-server/pom.xml       |   4 +-
 .../server/RestfulObjectsApplication.java       |   6 +-
 .../server/resources/DomainResourceHelper.java  |   9 +
 .../server/resources/ObjectActionArgHelper.java |   3 +
 .../server/resources/VersionReprRenderer.java   |   2 +-
 .../IsisTransactionFilterForRestfulObjects.java |   5 +
 core/viewer-wicket-applib/pom.xml               |   2 +-
 core/viewer-wicket-impl/pom.xml                 |   2 +-
 .../wicket/viewer/IsisWicketApplication.java    | 158 ++--
 .../viewer/guice/GuiceComponentInjector.java    | 137 ----
 .../viewer/guice/GuiceFieldValueFactory.java    | 161 ----
 .../viewer/guice/GuiceProxyTargetLocator.java   | 162 ----
 .../isis/DeploymentTypeAbstract.java            |   8 +-
 .../integration/wicket/LocalizerForIsis.java    | 159 ++++
 .../wicket/WebRequestCycleForIsis.java          |  15 +-
 .../ComponentFactoryRegistrarDefault.java       |  44 +-
 .../services/HintStoreUsingWicketSession.java   | 105 +++
 .../viewer/services/Object_clearHints.java      |  80 ++
 .../viewer/settings/IsisResourceSettings.java   |  15 +-
 core/viewer-wicket-model/pom.xml                |   2 +-
 .../model/hints/HasUiHintDisambiguator.java     |  24 +
 .../hints/IsisPropertyEditCompletedEvent.java   |  46 ++
 .../wicket/model/hints/IsisSelectorEvent.java   |  43 ++
 .../wicket/model/hints/IsisUiHintEvent.java     |  38 -
 .../wicket/model/hints/UiHintContainer.java     |  37 +-
 .../model/hints/UiHintPathSignificant.java      |  21 -
 .../model/mementos/ObjectAdapterMemento.java    |  15 +-
 .../wicket/model/models/ActionExecutor.java     |  35 -
 .../viewer/wicket/model/models/ActionModel.java |  46 +-
 .../model/models/EntityCollectionModel.java     | 101 ++-
 .../viewer/wicket/model/models/EntityModel.java | 265 +++----
 .../wicket/model/models/ExecutingPanel.java     |  42 +
 .../wicket/model/models/ModelAbstract.java      |  72 +-
 .../viewer/wicket/model/models/ScalarModel.java |  85 ++
 .../wicket/model/util/ComponentHintKey.java     | 142 ++++
 .../wicket/model/models/ActionModelTest.java    |   8 +-
 .../model/models/EntityModel_hintsTest.java     | 141 ++++
 .../wicket/model/models/ModelAbstractTest.java  | 170 ----
 core/viewer-wicket-ui/pom.xml                   |   2 +-
 .../isis/viewer/wicket/ui/ComponentType.java    |  19 +-
 .../ActionResultResponseType.java               |  20 +-
 .../entityactions/AdditionalLinksPanel.java     |   2 +-
 .../entityactions/EntityActionUtil.java         |  33 +-
 .../serviceactions/ServiceActionsPanel.css      |   5 +
 .../actionprompt/ActionPromptHeaderPanel.java   |  18 +-
 .../actionprompt/ActionPromptModalWindow.java   |  15 +-
 .../ui/components/actions/ActionPanel.html      |  10 +-
 .../ui/components/actions/ActionPanel.java      |  15 +-
 .../actions/ActionParametersFormPanel.java      |  18 +-
 .../components/collection/CollectionPanel.java  |  36 +-
 .../selector/CollectionSelectorHelper.java      | 122 ++-
 .../selector/CollectionSelectorPanel.java       |  65 +-
 .../selector/UNUSED_CollectionSelectorPanel.css |  60 --
 .../CollectionContentsAsAjaxTablePanel.java     |  30 +-
 ...llectionContentsAsAjaxTablePanelFactory.java |   2 +-
 .../ajaxtable/IsisAjaxFallbackDataTable.java    |  30 +-
 .../IsisAjaxFallbackHeadersToolbar.java         |   9 +-
 .../ajaxtable/IsisAjaxNavigationToolbar.java    |  37 +-
 .../ajaxtable/IsisAjaxPagingNavigationLink.java |   5 +-
 .../columns/ObjectAdapterPropertyColumn.java    |   5 +
 .../CollectionContentsMultipleViewsPanel.java   | 108 ++-
 ...ectionContentsMultipleViewsPanelFactory.java |   2 +-
 .../CollectionContentsAsUnresolvedPanel.html    |  29 -
 .../CollectionContentsAsUnresolvedPanel.java    |  43 --
 ...lectionContentsAsUnresolvedPanelFactory.java |  70 --
 .../CollectionContentsHiddenPanel.html          |  29 +
 .../CollectionContentsHiddenPanel.java          |  43 ++
 .../CollectionContentsHiddenPanelFactory.java   |  70 ++
 .../entity/EntityComponentFactoryAbstract.java  |  14 +-
 .../collection/EntityCollectionPanel.html       |  46 ++
 .../collection/EntityCollectionPanel.java       | 166 ++++
 .../collections/EntityCollectionsPanel.html     |  49 --
 .../collections/EntityCollectionsPanel.java     | 177 -----
 .../EntityCollectionsPanelFactory.java          |  49 --
 .../entity/combined/EntityCombinedPanel.html    |  29 -
 .../entity/combined/EntityCombinedPanel.java    |  60 --
 .../combined/EntityCombinedPanelFactory.java    |  48 --
 .../entity/fieldset/PropertyGroup.html          |  41 +
 .../entity/fieldset/PropertyGroup.java          | 175 +++++
 .../entity/header/EntityHeaderPanel.java        |   6 +-
 .../entity/properties/EntityPropertiesForm.java | 774 -------------------
 .../properties/EntityPropertiesForm.properties  |  22 -
 .../properties/EntityPropertiesPanel.html       | 104 ---
 .../properties/EntityPropertiesPanel.java       |  60 --
 .../EntityPropertiesPanelFactory.java           |  46 --
 .../links/EntityLinksSelectorPanel.java         |  22 +-
 .../links/EntityLinksSelectorPanelFactory.java  |  17 +-
 .../ui/components/layout/bs3/BS3GridPanel.html  |  28 +
 .../ui/components/layout/bs3/BS3GridPanel.java  |  63 ++
 .../wicket/ui/components/layout/bs3/Util.java   |  44 ++
 .../layout/bs3/clearfix/ClearFix.html           |  26 +
 .../layout/bs3/clearfix/ClearFix.java           |  69 ++
 .../ui/components/layout/bs3/col/Col.html       |  49 ++
 .../ui/components/layout/bs3/col/Col.java       | 327 ++++++++
 ...eatingViewWithDynamicallyVisibleContent.java |  54 ++
 .../ui/components/layout/bs3/row/Row.html       |  28 +
 .../ui/components/layout/bs3/row/Row.java       | 107 +++
 .../layout/bs3/tabs/TabGroupPanel.java          | 127 +++
 .../ui/components/layout/bs3/tabs/TabPanel.html |  30 +
 .../ui/components/layout/bs3/tabs/TabPanel.java | 100 +++
 .../property/PropertyEditFormPanel.html         |  42 +
 .../property/PropertyEditFormPanel.java         | 199 +++++
 .../property/PropertyEditFormPanelFactory.java  |  52 ++
 .../components/property/PropertyEditPanel.html  |  35 +
 .../components/property/PropertyEditPanel.java  | 302 ++++++++
 .../property/PropertyEditPanelFactory.java      |  52 ++
 .../property/PropertyEditPromptHeaderPanel.html |  32 +
 .../property/PropertyEditPromptHeaderPanel.java |  63 ++
 .../components/scalars/ScalarPanelAbstract.html |  13 +-
 .../components/scalars/ScalarPanelAbstract.java |  47 +-
 .../scalars/ScalarPanelTextFieldAbstract.java   |  11 +-
 .../isisapplib/IsisBlobOrClobPanelAbstract.html |  29 +-
 .../isisapplib/IsisBlobOrClobPanelAbstract.java |   7 +-
 .../scalars/primitive/BooleanPanel.html         |  17 +-
 .../scalars/reference/ReferencePanel.html       |  27 +-
 .../scalars/reference/ReferencePanel.java       |  17 +-
 .../StandaloneCollectionPanel.html              |  26 +-
 .../StandaloneCollectionPanel.java              |  39 +-
 .../widgets/breadcrumbs/BreadcrumbPanel.html    |   4 +
 ...UiHintPathSignificantWebMarkupContainer.java |  34 -
 .../linkandlabel/ActionLinkFactoryAbstract.java |  14 +-
 .../valuechoices/ValueChoicesSelect2Panel.html  |  17 +-
 .../valuechoices/ValueChoicesSelect2Panel.java  |   7 +
 .../ValueChoicesSelect2PanelFactory.java        |   7 +-
 .../widgets/zclip/ZeroClipboardPanel.html       |   5 -
 .../widgets/zclip/ZeroClipboardPanel.java       |  74 +-
 .../viewer/wicket/ui/pages/PageAbstract.java    |   2 +-
 .../ui/pages/bootstrap-overrides-flatly.css     |   5 +
 .../wicket/ui/pages/bootstrap-overrides.css     | 120 ++-
 .../wicket/ui/pages/entity/EntityPage.java      |  62 +-
 .../ui/pages/jquery.isis.wicket.viewer.js       |  11 +
 .../viewer/wicket/ui/pages/value/ValuePage.html |  10 +-
 .../ui/pages/voidreturn/VoidReturnPage.html     |  16 +-
 .../ui/panels/HasDynamicallyVisibleContent.java |  36 +
 .../viewer/wicket/ui/panels/PanelAbstract.java  |   1 +
 .../viewer/wicket/ui/util/CssIdAppender.java    |  70 ++
 core/webserver/pom.xml                          |   3 +-
 core/wrapper/pom.xml                            |  17 +-
 .../core/wrapper/WrapperFactoryDefault.java     |   2 +
 .../handlers/DomainObjectInvocationHandler.java |  11 +
 example/application/simpleapp/app/pom.xml       |   2 +-
 .../app/services/homepage/HomePageService.java  |   6 +-
 .../homepage/HomePageViewModel.layout.json      |  43 --
 .../homepage/HomePageViewModel.layout.xml       |  49 ++
 example/application/simpleapp/dom/pom.xml       |  14 +-
 .../java/domainapp/dom/simple/SimpleObject.java |  53 +-
 .../dom/simple/SimpleObject.layout.json         |  56 --
 .../dom/simple/SimpleObject.layout.xml          |  63 ++
 .../domainapp/dom/simple/SimpleObjects.java     |  24 +-
 .../domainapp/dom/simple/SimpleObjectsTest.java |  12 +-
 example/application/simpleapp/fixture/pom.xml   |   2 +-
 .../application/simpleapp/integtests/pom.xml    |  55 +-
 .../modules/simple/SimpleObjectIntegTest.java   |  44 +-
 example/application/simpleapp/pom.xml           |  25 +-
 .../webapp/ide/eclipse/launch/.gitignore        |   8 +-
 .../ide/eclipse/launch/SimpleApp-JREBEL.launch  |  31 +
 .../launch/SimpleApp-PROTOTYPE-jrebel.launch    |  31 -
 .../SimpleApp-PROTOTYPE-no-fixtures.launch      |  23 -
 ...OTOTYPE-with-fixtures-bypass-security.launch |  20 +
 .../SimpleApp-PROTOTYPE-with-fixtures.launch    |   2 +-
 .../eclipse/launch/SimpleApp-PROTOTYPE.launch   |  20 +
 .../launch/SimpleApp-SERVER-no-fixtures.launch  |  23 -
 .../ide/eclipse/launch/SimpleApp-SERVER.launch  |  20 +
 ..._PROTOTYPE_with_fixtures-bypass-security.xml |  28 +
 .../SimpleApp_PROTOTYPE_with_fixtures.xml       |  28 +
 .../ide/intellij/launch/SimpleApp_SERVER.xml    |  28 +
 .../launch/SimpleApp__enhance_only_.xml         |   2 +-
 example/application/simpleapp/webapp/pom.xml    | 352 ++++-----
 .../src/main/jettyconsole/isis-banner.pdn       | Bin 69658 -> 64162 bytes
 .../src/main/jettyconsole/isis-banner.png       | Bin 30776 -> 27310 bytes
 .../webapp/DomainApplication.properties         |  28 +
 .../src/main/webapp/WEB-INF/isis.properties     |   2 +-
 .../src/main/webapp/WEB-INF/translations-en.po  | 323 +++++++-
 .../src/main/webapp/WEB-INF/translations-es.po  | 323 +++++++-
 .../src/main/webapp/WEB-INF/translations-nl.po  | 328 +++++++-
 .../src/main/webapp/WEB-INF/translations.po     | 328 +++++++-
 .../webapp/WEB-INF/viewer_wicket.properties     |   6 -
 .../webapp/src/main/webapp/WEB-INF/web.xml      |   9 +-
 .../src/main/webapp/swagger-ui/index.html       |  43 +-
 example/archetype/simpleapp/pom.xml             |   6 +-
 .../META-INF/maven/archetype-metadata.xml       |   4 +-
 ...ppAppManifestWithFixturesBypassSecurity.java |  38 +
 .../app/services/homepage/HomePageService.java  |   6 +-
 .../homepage/HomePageViewModel.layout.json      |  43 --
 .../homepage/HomePageViewModel.layout.xml       |  47 ++
 .../prototyping/HideMixinsForHomePage.java      |  56 ++
 .../resources/archetype-resources/dom/pom.xml   |   5 +-
 .../java/domainapp/dom/simple/SimpleObject.java |  59 +-
 .../dom/simple/SimpleObject.layout.json         |  56 --
 .../dom/simple/SimpleObject.layout.xml          |  68 ++
 .../domainapp/dom/simple/SimpleObjects.java     |  24 +-
 .../domainapp/dom/simple/SimpleObjectsTest.java |  12 +-
 .../archetype-resources/integtests/pom.xml      | 147 +++-
 .../modules/simple/SimpleObjectIntegTest.java   |  44 +-
 .../main/resources/archetype-resources/pom.xml  |  23 +-
 .../webapp/ide/eclipse/launch/.gitignore        |   8 +-
 ...OTOTYPE-with-fixtures-bypass-security.launch |  22 +
 .../SimpleApp-PROTOTYPE-with-fixtures.launch    |  22 +
 .../eclipse/launch/SimpleApp-PROTOTYPE.launch   |  22 +
 .../ide/eclipse/launch/SimpleApp-SERVER.launch  |  22 +
 ..._PROTOTYPE_with_fixtures-bypass-security.xml |  31 +
 .../SimpleApp_PROTOTYPE_with_fixtures.xml       |  31 +
 .../ide/intellij/launch/SimpleApp_SERVER.xml    |  31 +
 .../launch/SimpleApp__enhance_only_.xml         |   2 +-
 .../archetype-resources/webapp/pom.xml          | 337 ++++----
 .../src/main/jettyconsole/isis-banner.pdn       | Bin 69658 -> 64162 bytes
 .../src/main/jettyconsole/isis-banner.png       | Bin 30776 -> 27310 bytes
 .../webapp/DomainApplication.properties         |  31 +
 .../src/main/webapp/WEB-INF/isis.properties     |  22 +-
 .../src/main/webapp/WEB-INF/translations-en.po  | 323 +++++++-
 .../src/main/webapp/WEB-INF/translations-es.po  | 323 +++++++-
 .../src/main/webapp/WEB-INF/translations-nl.po  | 328 +++++++-
 .../src/main/webapp/WEB-INF/translations.po     | 328 +++++++-
 .../webapp/WEB-INF/viewer_wicket.properties     |   6 -
 .../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 +-
 pom.xml                                         |  41 +-
 recreate_archetype_RELEASE.sh                   |   6 +-
 recreate_archetype_SNAPSHOT.sh                  |   6 +-
 scripts/promoterctag.sh                         |   2 +-
 972 files changed, 44738 insertions(+), 22438 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index 87e480b,e9972b1..9bb2684
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@@ -21,7 -21,7 +21,11 @@@
      <body>
          <wicket:panel>
              <span class="breadcrumbPanel">
++<<<<<<< HEAD
 +                <select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select>
++=======
+                 <input wicket:id="breadcrumbs" type="hidden" class="autoComplete select2-remote" style="width: 100%; padding: 0" />
++>>>>>>> ISIS-1223-upgrade-to-wicket-7
              </span>
          </wicket:panel>
      </body>

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 52de953,0874436..26b41c7
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@@ -27,14 -27,20 +27,21 @@@
              <div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
                  <div class="form-group" wicket:id="scalarIfRegular">
                      <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
-                     <div class="scalarValueWrapper">
-                         <div class="choicesPlaceholder">
-                             <select wicket:id="scalarValue" class="choices form-control input-sm select2-remote" style="width: 99.8%;"></select>
++
+                     <span class="scalarValueWrapper">
+                         <div class="scalarPlaceholder">
+                             <span class="scalarValueInput">
+                                 <span class="editing">
 -                                    <input wicket:id="scalarValue" type="hidden" class="choices input-sm select2-remote" style="width: 99.8%; padding: 0"/>
 -                                        <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
++                                    <select wicket:id="scalarValue" class="choices input-sm select2-remote" style="width: 99.8%;"></select>
++                                    <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+                                 </span>
+                             </span>
+                             <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
                          </div>
                          <span wicket:id="feedback" class="help-block"></span>
                          <span wicket:id="associatedActionLinksBelow"></span>
-                     </div>
-                     <span wicket:id="associatedActionLinksRight"></span>
+                     </span>
 -                    <div class="clearfix"/>
++                    <div class="clearfix"></div>
                  </div>
                  <span wicket:id="scalarIfCompact"></span>
              </div>

http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index c8f51a1,b6fb5f7..32bc2dc
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@@ -24,9 -24,9 +24,10 @@@ import javax.inject.Inject
  
  import com.google.common.base.Function;
  import com.google.common.base.Predicate;
+ import com.google.common.base.Strings;
  import com.google.common.collect.Collections2;
  import com.google.common.collect.Lists;
 +import org.apache.wicket.ajax.AjaxRequestTarget;
  import org.wicketstuff.select2.ChoiceProvider;
  import org.wicketstuff.select2.Select2Choice;