Merge branch 'master' into ISIS-1223-upgrade-to-wicket-7
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f4697c61 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f4697c61 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f4697c61 Branch: refs/heads/master Commit: f4697c617e82a8516e921ace9d6852d013c52c07 Parents: 82a3924 643a93f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Mar 25 15:10:11 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Mar 25 15:10:11 2016 +0100 ---------------------------------------------------------------------- STATUS | 6 + adocs/documentation/README.adoc | 2 +- adocs/documentation/monitor.sh | 2 +- adocs/documentation/pom.xml | 390 ++++++---- .../_migration-notes_1.10.0-to-1.11.0.adoc | 48 +- .../_migration-notes_1.11.0-to-1.12.0.adoc | 20 + .../_migration-notes_1.9.0-to-1.10.0.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 | 95 ++- .../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 | 79 -- .../guides/_cg_isis-maven-plugin_swagger.adoc | 107 --- .../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 ++ .../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 +- .../asciidoc/guides/_rgant-DomainService.adoc | 2 +- .../guides/_rgant-Parameter_regexPattern.adoc | 4 +- .../guides/_rgant-Property_domainEvent.adoc | 2 +- .../guides/_rgant-Property_regexPattern.adoc | 6 +- .../src/main/asciidoc/guides/_rgant-Title.adoc | 2 +- .../guides/_rgant-XmlJavaTypeAdapter.adoc | 4 +- .../asciidoc/guides/_rgant-XmlRootElement.adoc | 4 +- .../guides/_rgcfg_configuring-core.adoc | 32 +- .../main/asciidoc/guides/_rgcms_classes.adoc | 4 +- .../_rgcms_classes_i18n_TranslatableString.adoc | 1 + .../asciidoc/guides/_rgcms_classes_layout.adoc | 94 +++ .../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_Persistable.adoc | 34 - ..._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/_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 | 340 -------- .../guides/_rgsvc_api_AcceptHeaderService.adoc | 7 +- .../_rgsvc_api_ActionInvocationContext.adoc | 11 +- ..._rgsvc_api_ApplicationFeatureRepository.adoc | 59 ++ .../guides/_rgsvc_api_BackgroundService.adoc | 2 +- .../guides/_rgsvc_api_BookmarkService.adoc | 2 +- .../guides/_rgsvc_api_CommandContext.adoc | 2 +- .../guides/_rgsvc_api_ConfigurationService.adoc | 88 +++ .../guides/_rgsvc_api_DeepLinkService.adoc | 2 +- .../_rgsvc_api_DomainObjectContainer.adoc | 35 +- ...nObjectContainer_generic-repository-api.adoc | 5 - ..._api_DomainObjectContainer_messages-api.adoc | 9 +- ...mainObjectContainer_object-creation-api.adoc | 6 +- ...nObjectContainer_object-persistence-api.adoc | 10 +- ..._DomainObjectContainer_presentation-api.adoc | 3 +- ...pi_DomainObjectContainer_properties-api.adoc | 4 - ..._api_DomainObjectContainer_security-api.adoc | 1 - ..._api_DomainObjectContainer_services-api.adoc | 7 +- ...pi_DomainObjectContainer_validation-api.adoc | 15 +- .../guides/_rgsvc_api_EmailService.adoc | 2 +- .../guides/_rgsvc_api_EventBusService.adoc | 4 +- .../guides/_rgsvc_api_FactoryService.adoc | 79 ++ .../guides/_rgsvc_api_GuiceBeanProvider.adoc | 2 +- .../guides/_rgsvc_api_IsisJdoSupport.adoc | 2 +- .../asciidoc/guides/_rgsvc_api_JaxbService.adoc | 8 +- .../guides/_rgsvc_api_LayoutService.adoc | 107 +++ .../guides/_rgsvc_api_MementoService.adoc | 2 +- .../guides/_rgsvc_api_MessageService.adoc | 78 ++ .../guides/_rgsvc_api_MetamodelService.adoc | 25 +- .../guides/_rgsvc_api_QueryResultsCache.adoc | 2 +- .../guides/_rgsvc_api_RepositoryService.adoc | 189 +++++ .../asciidoc/guides/_rgsvc_api_Scratchpad.adoc | 2 +- .../guides/_rgsvc_api_ServiceRegistry.adoc | 72 ++ .../_rgsvc_api_SessionManagementService.adoc | 56 ++ .../asciidoc/guides/_rgsvc_api_SudoService.adoc | 2 +- .../guides/_rgsvc_api_SwaggerService.adoc | 8 +- .../guides/_rgsvc_api_TitleService.adoc | 74 ++ .../guides/_rgsvc_api_TransactionService.adoc | 65 ++ .../asciidoc/guides/_rgsvc_api_UserService.adoc | 83 ++ .../guides/_rgsvc_api_WrapperFactory.adoc | 2 +- .../guides/_rgsvc_api_XmlSnapshotService.adoc | 7 +- .../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 +++++ .../src/main/asciidoc/guides/_rgsvc_spi.adoc | 313 -------- .../_rgsvc_spi_ClassDiscoveryService.adoc | 2 +- .../_rgsvc_spi_ContentMappingService.adoc | 107 ++- .../_rgsvc_spi_ContentNegotiationService.adoc | 2 +- .../_rgsvc_spi_EmailNotificationService.adoc | 2 +- ...spi_FixtureScriptsSpecificationProvider.adoc | 2 +- .../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 | 4 +- .../_rgsvc_spi_RepresentationService.adoc | 2 +- .../guides/_rgsvc_spi_RoutingService.adoc | 12 +- .../guides/_rgsvc_spi_TranslationService.adoc | 9 +- .../guides/_rgsvc_spi_TranslationsResolver.adoc | 2 +- .../guides/_rgsvc_spi_UrlEncodingService.adoc | 6 +- .../main/asciidoc/guides/_rgsvc_testing.adoc | 89 +++ .../main/asciidoc/guides/_tg_pet-clinic.adoc | 4 +- .../_tg_stop-scaffolding-start-coding.adoc | 4 +- .../src/main/asciidoc/guides/_ugbtb_i18n.adoc | 6 +- ...r-techniques_overriding-jdo-annotations.adoc | 4 +- ...placing-default-service-implementations.adoc | 2 +- ...gbtb_programming-model_custom-validator.adoc | 2 +- ...rogramming-model_layout-metadata-reader.adoc | 10 + .../guides/_ugbtb_view-models_jaxb.adoc | 472 +++++++---- .../_ugbtb_view-models_programming-model.adoc | 2 +- .../guides/_ugbtb_view-models_use-cases.adoc | 72 +- .../main/asciidoc/guides/_ugbtb_web-xml.adoc | 6 +- .../_ugfun_core-concepts_building-blocks.adoc | 2 +- ...re-concepts_framework-provided-services.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_domain-services.adoc | 7 +- .../asciidoc/guides/_ugfun_object-layout.adoc | 1 + .../guides/_ugfun_object-layout_dynamic.adoc | 42 +- .../_ugfun_object-layout_dynamic_xml.adoc | 401 ++++++++++ .../guides/_ugfun_object-layout_static.adoc | 49 +- .../_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 | 4 +- ..._ugtst_unit-test-support_contract-tests.adoc | 2 +- .../asciidoc/guides/_ugvro_architecture.adoc | 3 +- .../guides/_ugvro_configuration-properties.adoc | 5 +- .../_ugvro_simplified-representations.adoc | 2 +- ...epresentations_configuration-properties.adoc | 2 +- .../guides/_ugvw_configuration-properties.adoc | 17 +- ...ugvw_customisation_tweaking-css-classes.adoc | 151 +++- .../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 ++ .../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 | 9 +- .../src/main/asciidoc/guides/ugfun.adoc | 9 +- .../src/main/asciidoc/guides/ugsec.adoc | 9 +- .../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 116303 -> 88063 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 | 90 ++- .../src/main/asciidoc/isis-in-pictures.adoc | 15 +- .../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 | 16 +- .../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 | 2 +- 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 + .../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 | 8 +- .../applib/services/dto/Dto_downloadXsd.java | 4 +- .../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 + .../jaxb/CatalogingSchemaOutputResolver.java | 152 ++++ .../isis/applib/services/jaxb/JaxbService.java | 178 ++++- .../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 +++++ .../sessmgmt/SessionManagementService.java | 44 ++ .../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/IsisMojoXsd.java | 10 +- core/metamodel/pom.xml | 9 +- .../isis/core/commons/lang/ArrayExtensions.java | 16 +- .../isis/core/commons/lang/ClassExtensions.java | 12 +- .../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 ++ ...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 + .../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 | 40 +- .../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 | 358 +++------ .../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 | 33 +- .../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/internal/Generation.java | 40 +- .../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 | 52 +- .../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 | 7 +- .../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 | 241 ++++-- core/runtime/pom.xml | 28 +- .../internal/RuntimeContextFromSession.java | 5 + ...shingServiceWithDefaultPayloadFactories.java | 2 +- .../core/runtime/runner/IsisInjectModule.java | 14 +- .../runtime/services/DeweyOrderComparator.java | 82 -- .../ServicesInstallerFromAnnotation.java | 7 +- .../ServicesInstallerFromConfiguration.java | 1 + ...InstallerFromConfigurationAndAnnotation.java | 1 + .../i18n/po/TranslationServicePoMenu.java | 10 +- .../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 + .../system/transaction/IsisTransaction.java | 42 +- .../isis/core/webapp/IsisSessionFilter.java | 23 +- .../core/webapp/IsisWebAppBootstrapper.java | 25 +- .../core/runtime/context/IsisContextTest.java | 140 ---- .../services/DeweyOrderComparatorTest.java | 2 + .../services/i18n/po/PoWriterTest_escape.java | 18 + .../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 +- .../rendering/domainobjects/MemberType.java | 28 +- .../service/conmap/ContentMappingService.java | 7 +- .../ContentNegotiationServiceXRoDomainType.java | 19 +- core/viewer-restfulobjects-server/pom.xml | 4 +- .../server/resources/DomainResourceHelper.java | 9 + .../server/resources/VersionReprRenderer.java | 2 +- core/viewer-wicket-applib/pom.xml | 2 +- core/viewer-wicket-impl/pom.xml | 2 +- .../wicket/viewer/IsisWicketApplication.java | 154 ++-- .../isis/DeploymentTypeAbstract.java | 8 +- .../wicket/WebRequestCycleForIsis.java | 15 +- .../ComponentFactoryRegistrarDefault.java | 44 +- .../services/HintStoreUsingWicketSession.java | 105 +++ .../viewer/services/Object_clearHints.java | 80 ++ .../viewer/settings/IsisResourceSettings.java | 11 +- 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 | 29 +- .../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 | 779 ------------------- .../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 | 9 +- .../StandaloneCollectionPanel.html | 26 +- .../StandaloneCollectionPanel.java | 39 +- ...UiHintPathSignificantWebMarkupContainer.java | 34 - .../linkandlabel/ActionLinkFactoryAbstract.java | 14 +- .../valuechoices/ValueChoicesSelect2Panel.html | 16 +- .../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 | 39 +- .../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 | 63 +- .../java/domainapp/dom/simple/SimpleObject.java | 55 +- .../dom/simple/SimpleObject.layout.json | 60 -- .../dom/simple/SimpleObject.layout.xml | 63 ++ .../domainapp/dom/simple/SimpleObjects.java | 14 +- .../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 .../src/main/webapp/WEB-INF/isis.properties | 2 +- .../src/main/webapp/WEB-INF/translations-en.po | 2 +- .../src/main/webapp/WEB-INF/translations-es.po | 2 +- .../src/main/webapp/WEB-INF/translations-nl.po | 2 +- .../src/main/webapp/WEB-INF/translations.po | 2 +- .../webapp/WEB-INF/viewer_wicket.properties | 6 - .../src/main/webapp/swagger-ui/index.html | 18 + 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 +- 740 files changed, 34703 insertions(+), 14974 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index 6d59370,1e09119..6b0c876 --- a/core/pom.xml +++ b/core/pom.xml @@@ -103,37 -112,46 +112,45 @@@ <hamcrest.version>1.3</hamcrest.version> - <objenesis.version>1.4</objenesis.version> - <javassist.version>3.19.0-GA</javassist.version> - <reflections.version>0.9.9</reflections.version> + <objenesis.version>2.2</objenesis.version> + <javassist.version>3.20.0-GA</javassist.version> + <reflections.version>0.9.10</reflections.version> - <commons-logging.version>1.1.2</commons-logging.version> - <commons-cli.version>1.2</commons-cli.version> + <commons-logging.version>1.2</commons-logging.version> + <commons-cli.version>1.3.1</commons-cli.version> <commons-httpclient.version>3.1</commons-httpclient.version> - <commons-codec.version>1.9</commons-codec.version> + <commons-codec.version>1.10</commons-codec.version> + <commons-email.version>1.4</commons-email.version> + <com-sun-mail.version>1.5.2</com-sun-mail.version> - <jackson.version>2.5.0</jackson.version> - <gson.version>2.3.1</gson.version> + <axon-core.version>2.4</axon-core.version> + + <jackson.version>2.6.4</jackson.version> + <gson.version>2.5</gson.version> + <swagger-core.version>1.5.5</swagger-core.version> + <swagger-ui.version>2.1.3</swagger-ui.version> + <webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version> <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver --> + <!-- using 2.3.3 throws SQL exception in simpleapp integtests --> <hsqldb.version>2.3.1</hsqldb.version> <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version> - <resteasy-jaxrs.version>3.0.11.Final</resteasy-jaxrs.version> + <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version> - <jetty.version>9.2.11.v20150529</jetty.version> + <jetty.version>9.3.6.v20151106</jetty.version> - <wicket.version>6.20.0</wicket.version> - <wicketstuff.version>6.20.0</wicketstuff.version> + <wicket.version>7.2.0</wicket.version> - <wicketstuff.version>7.1.0</wicketstuff.version> ++ <wicketstuff.version>7.2.0</wicketstuff.version> - <wicket-webjars.version>0.4.8</wicket-webjars.version> - <wicket-bootstrap.version>0.9.15</wicket-bootstrap.version> - <wicket-source.version>6.0.0.8</wicket-source.version> + <wicket-webjars.version>0.5.3</wicket-webjars.version> - <wicket-bootstrap.version>0.10.4</wicket-bootstrap.version> ++ <wicket-bootstrap.version>0.10.6</wicket-bootstrap.version> + <wicket-source.version>7.0.0</wicket-source.version> - <wicket-select2.version>6.20.0</wicket-select2.version> - <select2.version>3.5.2</select2.version> + <select2.version>4.0.0-2</select2.version> <jquery-ui.version>1.11.4</jquery-ui.version> - <guice.version>3.0</guice.version> - <picocontainer.version>2.14.3</picocontainer.version> + <guice.version>4.0</guice.version> + <picocontainer.version>2.15</picocontainer.version> <dom4j.version>1.6.1</dom4j.version> <jdom.version>2.0.2</jdom.version> http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-applib/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index 673bf3e,2b24c80..0f78f39 --- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@@ -26,40 -26,38 +26,7 @@@ import java.util.Set import javax.servlet.ServletContext; --import com.google.common.base.Function; - import com.google.common.base.Throwables; - import com.google.common.collect.Iterables; --import com.google.common.collect.Lists; --import com.google.common.collect.Sets; --import com.google.inject.Guice; --import com.google.inject.Inject; --import com.google.inject.Injector; --import com.google.inject.Module; - import org.apache.wicket.guice.GuiceComponentInjector; - import org.wicketstuff.select2.ApplicationSettings; -- --import org.apache.wicket.Application; --import org.apache.wicket.ConverterLocator; --import org.apache.wicket.IConverterLocator; --import org.apache.wicket.Page; --import org.apache.wicket.RuntimeConfigurationType; --import org.apache.wicket.SharedResources; --import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; --import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; --import org.apache.wicket.core.request.mapper.MountedMapper; -import org.apache.wicket.guice.GuiceComponentInjector; --import org.apache.wicket.markup.head.IHeaderResponse; --import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse; --import org.apache.wicket.markup.html.IHeaderContributor; --import org.apache.wicket.markup.html.IHeaderResponseDecorator; --import org.apache.wicket.markup.html.WebPage; --import org.apache.wicket.request.cycle.IRequestCycleListener; --import org.apache.wicket.request.cycle.PageRequestHandlerTracker; --import org.apache.wicket.request.cycle.RequestCycleListenerCollection; --import org.apache.wicket.request.resource.CssResourceReference; - import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy; -import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy; --import org.apache.wicket.util.time.Duration; --import org.slf4j.Logger; --import org.slf4j.LoggerFactory; -import org.wicketstuff.select2.ApplicationSettings; ++import net.ftlines.wicketsource.WicketSource; import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; @@@ -108,6 -106,6 +75,38 @@@ import org.apache.isis.viewer.wicket.vi import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento; import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis; import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings; ++import org.apache.wicket.Application; ++import org.apache.wicket.ConverterLocator; ++import org.apache.wicket.IConverterLocator; ++import org.apache.wicket.Page; ++import org.apache.wicket.RuntimeConfigurationType; ++import org.apache.wicket.SharedResources; ++import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; ++import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; ++import org.apache.wicket.core.request.mapper.MountedMapper; ++import org.apache.wicket.guice.GuiceComponentInjector; ++import org.apache.wicket.markup.head.IHeaderResponse; ++import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse; ++import org.apache.wicket.markup.html.IHeaderContributor; ++import org.apache.wicket.markup.html.IHeaderResponseDecorator; ++import org.apache.wicket.markup.html.WebPage; ++import org.apache.wicket.request.cycle.IRequestCycleListener; ++import org.apache.wicket.request.cycle.PageRequestHandlerTracker; ++import org.apache.wicket.request.cycle.RequestCycleListenerCollection; ++import org.apache.wicket.request.resource.CssResourceReference; ++import org.apache.wicket.settings.RequestCycleSettings; ++import org.apache.wicket.util.time.Duration; ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; ++import org.wicketstuff.select2.ApplicationSettings; ++ ++import com.google.common.base.Function; ++import com.google.common.collect.Lists; ++import com.google.common.collect.Sets; ++import com.google.inject.Guice; ++import com.google.inject.Inject; ++import com.google.inject.Injector; ++import com.google.inject.Module; import de.agilecoders.wicket.core.Bootstrap; import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior; @@@ -116,7 -114,7 +115,6 @@@ import de.agilecoders.wicket.core.setti import de.agilecoders.wicket.webjars.WicketWebjars; import de.agilecoders.wicket.webjars.settings.IWebjarsSettings; import de.agilecoders.wicket.webjars.settings.WebjarsSettings; --import net.ftlines.wicketsource.WicketSource; /** * Main application, subclassing the Wicket {@link Application} and @@@ -246,7 -245,7 +245,7 @@@ public class IsisWicketApplicatio configureLogging(isisConfigDir); -- getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER); ++ getRequestCycleSettings().setRenderStrategy(RequestCycleSettings.RenderStrategy.REDIRECT_TO_RENDER); getResourceSettings().setParentFolderPlaceholder("$up$"); @@@ -318,9 -320,16 +320,15 @@@ ApplicationSettings select2Settings = ApplicationSettings.get(); select2Settings.setCssReference(new Select2BootstrapCssReference()); select2Settings.setJavaScriptReference(new Select2JsReference()); - select2Settings.setIncludeJqueryUI(false); } - private void configureWicketSourcePlugin() { + protected void configureWicketSourcePluginIfNecessary(final IsisConfiguration configuration) { + if(isWicketSourcePluginEnabled(configuration)) { + configureWicketSourcePlugin(); + } + } + + protected void configureWicketSourcePlugin() { if(!deploymentType.isProduction()) { WicketSource.configure(this); } http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java index 22a1b9b,f75ecda..13d3cfd --- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java +++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java @@@ -20,14 -20,14 +20,19 @@@ package org.apache.isis.viewer.wicket.viewer.settings; import java.util.List; ++ ++import org.apache.isis.viewer.wicket.viewer.integration.wicket.LocalizerForIsis; import org.apache.wicket.Application; import org.apache.wicket.Localizer; --import org.apache.wicket.resource.loader.*; -import org.apache.wicket.settings.def.ResourceSettings; ++import org.apache.wicket.resource.loader.ClassStringResourceLoader; ++import org.apache.wicket.resource.loader.ComponentStringResourceLoader; ++import org.apache.wicket.resource.loader.IStringResourceLoader; ++import org.apache.wicket.resource.loader.InitializerStringResourceLoader; ++import org.apache.wicket.resource.loader.PackageStringResourceLoader; ++import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; +import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.util.lang.Generics; --import org.apache.isis.viewer.wicket.viewer.integration.wicket.LocalizerForIsis; -- public class IsisResourceSettings extends ResourceSettings { /** Chain of string resource loaders to use */ http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-model/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java ----------------------------------------------------------------------
