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/82a39243 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/82a39243 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/82a39243 Branch: refs/heads/master Commit: 82a392435399f4893ba22f8b4495040c32f0a017 Parents: 803fbc1 047e5ef Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Dec 25 14:07:46 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Dec 25 14:07:46 2015 +0100 ---------------------------------------------------------------------- README.adoc | 9 +- adocs/documentation/monitor.rb | 42 +- adocs/documentation/pom.xml | 2 +- .../_migration-notes_1.10.0-to-1.11.0.adoc | 54 +- ...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 | 4 +- .../asciidoc/_powered-by_gesconsultor-grc.adoc | 2 +- .../src/main/asciidoc/documentation.adoc | 3 +- .../asciidoc/guides/_cg_asciidoc-templates.adoc | 8 +- .../asciidoc/guides/_cg_isis-maven-plugin.adoc | 18 +- .../guides/_cg_isis-maven-plugin_swagger.adoc | 107 +++ .../guides/_cg_isis-maven-plugin_xsd.adoc | 6 +- .../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 | 8 +- .../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 | 8 +- .../guides/_rgant-Collection_notPersisted.adoc | 2 +- .../asciidoc/guides/_rgant-Discriminator.adoc | 2 +- .../asciidoc/guides/_rgant-DomainObject.adoc | 16 +- .../guides/_rgant-DomainObjectLayout.adoc | 6 +- ...gant-DomainObjectLayout_cssClassUiEvent.adoc | 12 +- .../_rgant-DomainObjectLayout_iconUiEvent.adoc | 12 +- .../guides/_rgant-DomainObjectLayout_named.adoc | 2 +- .../_rgant-DomainObjectLayout_titleUiEvent.adoc | 12 +- .../guides/_rgant-DomainObject_auditing.adoc | 2 +- ...gant-DomainObject_createdLifecycleEvent.adoc | 8 +- ...rgant-DomainObject_loadedLifecycleEvent.adoc | 4 +- .../guides/_rgant-DomainObject_nature.adoc | 2 +- .../guides/_rgant-DomainObject_objectType.adoc | 2 +- ...nt-DomainObject_persistedLifecycleEvent.adoc | 4 +- ...t-DomainObject_persistingLifecycleEvent.adoc | 4 +- .../guides/_rgant-DomainObject_publishing.adoc | 2 +- ...ant-DomainObject_removingLifecycleEvent.adoc | 4 +- ...gant-DomainObject_updatedLifecycleEvent.adoc | 4 +- ...ant-DomainObject_updatingLifecycleEvent.adoc | 4 +- .../src/main/asciidoc/guides/_rgant-Inject.adoc | 4 +- .../src/main/asciidoc/guides/_rgant-Mixin.adoc | 2 +- .../guides/_rgant-ParameterLayout_named.adoc | 2 +- .../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 | 6 +- .../guides/_rgant-Property_notPersisted.adoc | 2 +- .../asciidoc/guides/_rgant-RequestScoped.adoc | 2 +- .../main/asciidoc/guides/_rgant-ViewModel.adoc | 2 +- .../guides/_rgant-ViewModelLayout_named.adoc | 2 +- .../guides/_rgant-XmlJavaTypeAdapter.adoc | 4 +- .../asciidoc/guides/_rgant-XmlRootElement.adoc | 10 +- .../main/asciidoc/guides/_rgant_aaa_jee.adoc | 2 +- .../guides/_rgcfg_configuring-core.adoc | 18 +- .../guides/_rgcfg_configuring-datanucleus.adoc | 2 +- .../main/asciidoc/guides/_rgcms_classes.adoc | 2 +- .../guides/_rgcms_classes_domainevent.adoc | 2 +- ...s_classes_domainevent_ActionDomainEvent.adoc | 2 +- .../_rgcms_classes_i18n_TranslatableString.adoc | 2 +- .../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 +- .../guides/_rgcms_classes_roles_Dto.adoc | 4 +- .../_rgcms_classes_roles_HoldsUpdatedAt.adoc | 2 +- .../_rgcms_classes_roles_Persistable.adoc | 2 +- .../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 | 4 +- .../_rgcms_classes_super_FixtureScripts.adoc | 4 +- .../asciidoc/guides/_rgcms_classes_uievent.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/_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 --- .../src/main/asciidoc/guides/_rgsvc_api.adoc | 340 ++++++++++ .../guides/_rgsvc_api_AcceptHeaderService.adoc | 82 +++ .../_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 +++ .../_rgsvc_api_HomePageProviderService.adoc | 40 ++ .../guides/_rgsvc_api_IsisJdoSupport.adoc | 276 ++++++++ .../asciidoc/guides/_rgsvc_api_JaxbService.adoc | 68 ++ .../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_SwaggerService.adoc | 71 ++ .../guides/_rgsvc_api_WrapperFactory.adoc | 162 +++++ .../guides/_rgsvc_api_XmlSnapshotService.adoc | 220 ++++++ .../src/main/asciidoc/guides/_rgsvc_spi.adoc | 313 +++++++++ .../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_RoutingService.adoc | 69 ++ .../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 +++ .../_tg_stop-scaffolding-start-coding.adoc | 16 +- .../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 +- .../asciidoc/guides/_ugbtb_view-models.adoc | 19 + .../guides/_ugbtb_view-models_jaxb.adoc | 240 +++++++ .../_ugbtb_view-models_programming-model.adoc | 87 +++ .../guides/_ugbtb_view-models_use-cases.adoc | 142 ++++ .../main/asciidoc/guides/_ugbtb_web-xml.adoc | 25 +- .../_ugfun_core-concepts_building-blocks.adoc | 12 +- ...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 +- .../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 | 8 +- ...how-tos_ui-hints_names-and-descriptions.adoc | 2 +- .../_ugfun_object-layout_application-menu.adoc | 2 +- .../guides/_ugsec_api-for-applications.adoc | 2 +- .../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 +- .../asciidoc/guides/_ugvro_architecture.adoc | 6 +- .../guides/_ugvro_configuration-properties.adoc | 144 +++- .../main/asciidoc/guides/_ugvro_ro-spec.adoc | 2 +- .../_ugvro_simplified-representations.adoc | 37 +- ...epresentations_configuration-properties.adoc | 119 +--- .../guides/_ugvw_extending_custom-pages.adoc | 4 +- .../_ugvw_features_user-registration.adoc | 10 +- .../acceptheaderservice.png | Bin 0 -> 10997 bytes .../acceptheaderservice.pptx | Bin 0 -> 46935 bytes .../src/main/asciidoc/guides/rgsvc.adoc | 8 +- .../src/main/asciidoc/guides/ugbtb.adoc | 8 +- .../src/main/asciidoc/guides/ugsec.adoc | 2 +- .../isis-in-pictures/065-contributions.png | Bin 108489 -> 116303 bytes .../isis-in-pictures/067-contributed-action.png | Bin 25914 -> 20163 bytes .../documentation/src/main/asciidoc/index.html | 11 + .../src/main/asciidoc/isis-in-pictures.adoc | 13 +- .../templates/isis-asciidoc-templates-idea.xml | 2 +- adocs/template/document.html.erb | 16 - .../acceptheader/AcceptHeaderService.java | 32 + .../applib/services/dto/Dto_downloadXml.java | 2 +- .../applib/services/dto/Dto_downloadXsd.java | 2 +- .../homepage/HomePageProviderService.java | 43 ++ .../isis/applib/services/jaxb/JaxbService.java | 27 +- .../applib/services/routing/RoutingService.java | 34 + .../services/routing/RoutingServiceDefault.java | 58 ++ .../applib/services/swagger/SwaggerService.java | 22 +- .../isis/tool/mavenplugin/IsisMojoSwagger.java | 134 ++++ .../core/metamodel/adapter/ObjectAdapter.java | 18 +- .../all/i18n/TranslationFacetFactory.java | 7 +- .../facets/members/order/MemberOrderFacet.java | 4 + .../members/order/MemberOrderFacetAbstract.java | 6 + .../json/LayoutMetadataReaderFromJson.java | 3 +- .../container/DomainObjectContainerDefault.java | 1 + .../Persistable_downloadJdoMetadata.java | 8 +- .../services/swagger/SwaggerServiceDefault.java | 2 + .../services/swagger/internal/Util.java | 8 +- .../swagger/internal/ValuePropertyFactory.java | 22 + .../spec/feature/ObjectAssociation.java | 13 +- .../specimpl/ObjectSpecificationAbstract.java | 4 +- core/pom.xml | 2 +- .../opts/OptionHandlerSystemProperties.java | 2 +- .../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 | 5 +- .../core/runtime/services/i18n/po/Util.java | 33 + .../persistence/PersistenceSessionFactory.java | 21 +- .../isis/core/webapp/IsisSessionFilter.java | 43 +- .../services/i18n/po/PoWriterTest_escape.java | 26 + .../domainobjects/ActionResultReprRenderer.java | 2 +- .../ObjectPropertyReprRenderer.java | 2 +- .../RepresentationServiceContentNegotiator.java | 3 +- .../AcceptHeaderServiceForRest.java | 106 +++ .../ContentNegotiationServiceAbstract.java | 3 - .../ContentNegotiationServiceXRoDomainType.java | 46 +- .../server/RestfulObjectsApplication.java | 6 +- .../server/resources/ObjectActionArgHelper.java | 3 + .../IsisTransactionFilterForRestfulObjects.java | 5 + .../wicket/viewer/IsisWicketApplication.java | 6 +- .../viewer/guice/GuiceComponentInjector.java | 137 ---- .../viewer/guice/GuiceFieldValueFactory.java | 161 ----- .../viewer/guice/GuiceProxyTargetLocator.java | 162 ----- .../integration/wicket/LocalizerForIsis.java | 159 +++++ .../viewer/settings/IsisResourceSettings.java | 8 + .../viewer/wicket/model/models/ActionModel.java | 17 + .../entity/properties/EntityPropertiesForm.java | 17 +- .../reference/EntityLinkSelect2Panel.html | 4 +- .../scalars/reference/ReferencePanel.java | 8 - .../widgets/breadcrumbs/BreadcrumbPanel.html | 2 +- .../valuechoices/ValueChoicesSelect2Panel.html | 2 +- .../valuechoices/ValueChoicesSelect2Panel.java | 7 + .../wicket/ui/pages/entity/EntityPage.java | 27 +- example/application/simpleapp/dom/pom.xml | 51 ++ .../java/domainapp/dom/simple/SimpleObject.java | 14 + .../dom/simple/SimpleObject.layout.json | 4 + .../domainapp/dom/simple/SimpleObjects.java | 10 +- .../webapp/DomainApplication.properties | 28 + .../src/main/webapp/WEB-INF/translations-en.po | 321 ++++++++- .../src/main/webapp/WEB-INF/translations-es.po | 321 ++++++++- .../src/main/webapp/WEB-INF/translations-nl.po | 326 ++++++++- .../src/main/webapp/WEB-INF/translations.po | 326 ++++++++- .../webapp/src/main/webapp/WEB-INF/web.xml | 9 +- .../src/main/webapp/swagger-ui/index.html | 25 +- 364 files changed, 11270 insertions(+), 8703 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index 45d1803,05da9b6..6d59370 --- a/core/pom.xml +++ b/core/pom.xml @@@ -122,14 -122,15 +122,14 @@@ <jetty.version>9.2.11.v20150529</jetty.version> - <wicket.version>7.1.0</wicket.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> - <wicket-webjars.version>0.4.7</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-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> http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/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 a04290e,d43027b..673bf3e --- 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 @@@ -35,6 -35,6 +35,7 @@@ 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; http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/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 849b093,f75ecda..22a1b9b --- 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 @@@ -21,10 -21,13 +21,13 @@@ package org.apache.isis.viewer.wicket.v import java.util.List; 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.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 */
