You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/29 20:28:14 UTC
[isis] 19/23: Merge remote-tracking branch 'origin/v2' into v2
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c42d6fc5f2a1de71f7d83bbe59208ef78eaeccce
Merge: 5f3a37f b3ff1b2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 29 04:35:53 2019 +0000
Merge remote-tracking branch 'origin/v2' into v2
# Conflicts:
# mixins/datanucleus-enhance/pom.xml
# mixins/docker/pom.xml
# mixins/pom.xml
# mixins/standard/pom.xml
# mixins/surefire/pom.xml
.../isis/applib/mixins/dto/DtoMappingHelper.java | 2 +-
.../applib/services/registry/ServiceRegistry.java | 6 +-
.../commons/collections/{Bin.java => Can.java} | 155 +++++++-----
.../collections/{Bin_Empty.java => Can_Empty.java} | 8 +-
.../{Bin_Multiple.java => Can_Multiple.java} | 2 +-
.../{Bin_Singleton.java => Can_Singleton.java} | 2 +-
.../isis/commons/internal/collections/_Lists.java | 18 +-
.../isis/commons/internal/collections/_Maps.java | 145 ++++++++++++
.../commons/internal/collections/_Multimaps.java | 5 +-
.../isis/commons/internal/collections/_Sets.java | 1 -
.../isis/commons/internal/context/_Context.java | 6 +-
.../internal/context/_Context_ThreadLocal.java | 22 +-
.../commons/internal/exceptions/_Exceptions.java | 4 +-
.../isis/commons/internal/ioc/IocContainer.java | 6 +-
.../commons/internal/ioc/ManagedBeanAdapter.java | 4 +-
.../commons/internal/ioc/cdi/BeanAdapterCDI.java | 4 +-
.../apache/isis/commons/internal/ioc/cdi/_CDI.java | 14 +-
.../internal/ioc/spring/BeanAdapterSpring.java | 6 +-
.../internal/ioc/spring/IocContainerSpring.java | 12 +-
.../commons/internal/collections/_MapsTest.java | 127 ++++++++++
.../isis/config/registry/IsisBeanTypeRegistry.java | 21 +-
.../apache/isis/metamodel/MetaModelContext.java | 16 +-
.../isis/metamodel/MetaModelContext_usingIoc.java | 7 +
.../metamodel/adapter/loader/ObjectLoader.java | 75 ++++++
.../ObjectLoader_Builder.java} | 35 +--
.../loader/ObjectLoader_builtinHandlers.java | 260 +++++++++++++++++++++
.../metamodel/adapter/oid/factory/OidFactory.java | 20 +-
.../adapter/oid/factory/OidFactory_Builder.java | 9 +-
...viders.java => OidFactory_builtinHandlers.java} | 18 +-
.../isis/metamodel/consent/InteractionAdvisor.java | 14 +-
.../org/apache/isis/metamodel/facetapi/Facet.java | 23 +-
.../isis/metamodel/facetapi/FacetAbstract.java | 45 ++--
.../isis/metamodel/facetapi/FacetHolder.java | 19 +-
.../isis/metamodel/facetapi/FacetHolderImpl.java | 146 +++++++-----
.../isis/metamodel/facetapi/MetaModelRefiner.java | 4 +-
...nChoicesForCollectionParameterFacetFactory.java | 2 +-
.../actions/layout/ActionLayoutFacetFactory.java | 6 +-
.../PromptStyleFacetForActionLayoutAnnotation.java | 4 +-
...dFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
...ntributedFacetDerivedFromMixinFacetFactory.java | 2 +-
...uFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
.../facets/all/deficiencies/DeficiencyFacet.java | 10 +-
...cetOnCollectionDerivedFromImmutableFactory.java | 2 +-
.../facets/fallback/ActionChoicesFacetNone.java | 2 +-
.../facets/fallback/ActionDefaultsFacetNone.java | 2 +-
.../facets/fallback/DescribedAsFacetNone.java | 2 +-
.../metamodel/facets/fallback/HelpFacetNone.java | 2 +-
.../facets/fallback/MaxLengthFacetUnlimited.java | 2 +-
.../facets/fallback/MultiLineFacetNone.java | 2 +-
.../metamodel/facets/fallback/NamedFacetNone.java | 2 +-
.../metamodel/facets/fallback/TitleFacetNone.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
...assFacetOnActionFromConfiguredRegexFactory.java | 4 +-
.../forsession/DisableForSessionFacetNone.java | 2 +-
.../method/DisableForContextFacetNone.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 12 +-
.../hidden/forsession/HideForSessionFacetNone.java | 2 +-
.../hidden/method/HideForContextFacetNone.java | 2 +-
.../BookmarkPolicyFacetFallbackFactory.java | 4 +-
.../DomainObjectAnnotationFacetFactory.java | 2 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 2 +-
.../facets/object/entity/EntityFacet.java | 7 +-
...jectSpecIdFacetDerivedFromClassNameFactory.java | 2 +-
.../ProjectionFacetFromProjectingProperty.java | 2 +-
...CollectionDerivedFromViewModelFacetFactory.java | 2 +-
...tyDerivedFromRecreatableObjectFacetFactory.java | 2 +-
...ObjectFacetDeclarativeInitializingAbstract.java | 2 +-
.../title/methods/TitleFacetViaMethodsFactory.java | 2 +-
.../title/methods/TitleFacetViaToStringMethod.java | 2 +-
.../facets/object/value/ValueFacetAbstract.java | 11 +-
.../facets/object/value/ValueFacetSimple.java | 1 +
.../choices/ActionParameterChoicesFacetNone.java | 2 +-
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 4 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 2 +-
...tionParameterDefaultsFacetViaMethodFactory.java | 2 +-
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 2 +-
.../defaults/PropertyDefaultFacetNone.java | 2 +-
...PropertyDefaultFacetDerivedFromTypeFactory.java | 2 +-
...FacetOnPropertyDerivedFromImmutableFactory.java | 2 +-
.../DisabledFacetOnPropertyInferredFactory.java | 4 +-
...romptStyleFacetForPropertyLayoutAnnotation.java | 4 +-
.../validating/PropertyValidateFacetAbstract.java | 2 +-
.../validating/PropertyValidateFacetNone.java | 2 +-
.../value/image/ImageValueSemanticsProvider.java | 2 +-
.../JavaAwtImageValueSemanticsProvider.java | 2 +-
.../param/DeriveFacetsPostProcessor.java | 36 +--
.../ApplicationFeatureRepositoryDefault.java | 9 +-
.../services/grid/GridSystemServiceAbstract.java | 2 +-
.../services/metamodel/DomainMemberDefault.java | 2 +-
.../services/metamodel/MetaModelExporter.java | 2 +-
.../services/registry/ServiceRegistryDefault.java | 4 +-
.../services/swagger/internal/Generation.java | 15 +-
.../services/swagger/internal/Tagger.java | 43 ++--
.../apache/isis/metamodel/spec/ManagedObject.java | 151 +++++++++---
.../metamodel/spec/feature/ObjectAssociation.java | 2 +-
.../specloader/SpecificationCacheDefault.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 7 +-
.../classsubstitutor/ClassSubstitutor.java | 20 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../specloader/specimpl/ObjectActionDefault.java | 8 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specimpl/OneToOneAssociationDefault.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 4 +
.../isis/metamodel/ServiceRegistry_forTesting.java | 14 +-
.../Annotations_getAnnotations_on_Field_Test.java | 4 -
...notations_getAnnotations_on_Parameter_Test.java | 4 -
...nnotationFacetFactoryTest_ActionInvocation.java | 1 -
...ctionAnnotationFacetFactoryTest_Invocation.java | 1 -
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../title/TitleFacetViaMethodsFactoryTest.java | 2 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 3 -
...romptStyleFacetFromPropertyAnnotation_Test.java | 8 +-
.../ImageValueSemanticsProviderAbstractTest.java | 2 +-
.../services/ServiceInjectorLegacyTest.java | 5 +-
.../services/swagger/internal/TaggerTest.java | 16 +-
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 4 +-
.../jdo/metamodel/JdoProgrammingModelPlugin.java | 2 +-
...cIdFacetForJdoPersistenceCapableAnnotation.java | 2 +-
.../JdoPersistenceCapableFacetAbstract.java | 2 +-
.../JdoPersistenceCapableFacetImpl.java | 29 ++-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 6 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 4 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../isis/runtime/services/i18n/po/PoReader.java | 6 +-
.../services/i18n/po/TranslationServicePo.java | 10 +-
.../runtime/services/i18n/po/PoReaderTest.java | 6 +-
.../system/persistence/PersistenceSession.java | 4 +-
.../adaptermanager/ObjectAdapterContext.java | 2 +-
.../ObjectAdapterContext_Factories.java | 2 -
...{RendererContext.java => IResourceContext.java} | 30 ++-
.../restfulobjects/rendering/LinkBuilder.java | 8 +-
.../viewer/restfulobjects/rendering/OidUtils.java | 102 ++------
.../restfulobjects/rendering/RendererFactory.java | 5 +-
.../rendering/ReprRendererAbstract.java | 44 ++--
.../viewer/restfulobjects/rendering/Responses.java | 4 +-
.../AbstractObjectMemberReprRenderer.java | 22 +-
.../domainobjects/ActionResultReprRenderer.java | 20 +-
.../domainobjects/DomainObjectLinkTo.java | 22 +-
.../domainobjects/DomainObjectReprRenderer.java | 113 +++++----
.../domainobjects/DomainServiceLinkTo.java | 6 +-
.../rendering/domainobjects/JsonValueEncoder.java | 11 +-
.../domainobjects/JsonValueEncoder_Converters.java | 39 ++--
.../rendering/domainobjects/ListReprRenderer.java | 16 +-
.../domainobjects/ObjectActionReprRenderer.java | 33 ++-
.../domainobjects/ObjectAdapterLinkTo.java | 8 +-
.../rendering/domainobjects/ObjectAndAction.java | 4 +-
.../domainobjects/ObjectAndActionInvocation.java | 20 +-
.../domainobjects/ObjectAndCollection.java | 4 +-
.../domainobjects/ObjectAndCollection2.java | 4 +-
.../rendering/domainobjects/ObjectAndMember.java | 8 +-
.../rendering/domainobjects/ObjectAndProperty.java | 4 +-
.../domainobjects/ObjectAndProperty2.java | 8 +-
.../ObjectCollectionReprRenderer.java | 32 +--
.../domainobjects/ObjectPropertyReprRenderer.java | 24 +-
.../rendering/domainobjects/OidUtils.java | 54 -----
.../domainobjects/ScalarValueReprRenderer.java | 10 +-
.../AbstractTypeFeatureReprRenderer.java | 4 +-
.../AbstractTypeMemberReprRenderer.java | 8 +-
.../domaintypes/ActionDescriptionReprRenderer.java | 12 +-
.../ActionParameterDescriptionReprRenderer.java | 14 +-
.../CollectionDescriptionReprRenderer.java | 8 +-
.../domaintypes/DomainTypeReprRenderer.java | 28 +--
.../PropertyDescriptionReprRenderer.java | 10 +-
.../domaintypes/TypeActionResultReprRenderer.java | 4 +-
.../domaintypes/TypeListReprRenderer.java | 6 +-
.../rendering/service/RepresentationService.java | 30 +--
.../RepresentationServiceContentNegotiator.java | 26 +--
.../service/conneg/ContentNegotiationService.java | 30 +--
.../conneg/ContentNegotiationServiceAbstract.java | 32 ++-
...entNegotiationServiceForRestfulObjectsV1_0.java | 92 ++++----
.../ContentNegotiationServiceOrgApacheIsisV1.java | 100 ++++----
.../ContentNegotiationServiceXRoDomainType.java | 22 +-
.../viewer/restfulobjects/rendering/util/Util.java | 12 -
.../JsonValueEncoderTest_asAdapter.java | 16 +-
.../restfulobjects/server/ResourceContext.java | 19 +-
.../resources/DomainObjectResourceServerside.java | 66 +++---
.../server/resources/DomainResourceHelper.java | 256 ++++----------------
.../resources/DomainServiceResourceServerside.java | 20 +-
.../resources/DomainServicesListReprRenderer.java | 12 +-
.../server/resources/HealthReprRenderer.java | 4 +-
.../server/resources/HomePageReprRenderer.java | 39 ++--
.../server/resources/JsonParserHelper.java | 22 +-
.../server/resources/ObjectActionArgHelper.java | 22 +-
.../resources/ObjectAdapterAccessHelper.java | 22 +-
.../resources/ObjectAdapterUpdateHelper.java | 10 +-
.../server/resources/ResourceAbstract.java | 12 +-
.../server/resources/UserReprRenderer.java | 18 +-
.../server/resources/VersionReprRenderer.java | 12 +-
.../IsisWicketApplication_newPageFactory.java | 3 +-
.../wicket/model/models/EntityCollectionModel.java | 5 +-
.../model/models/ToggledMementosProvider.java | 5 +-
.../actionmenu/entityactions/LinkAndLabelUtil.java | 9 +-
.../ui/components/collection/CollectionPanel.java | 3 +-
.../CollectionContentsAsAjaxTablePanel.java | 4 +-
.../CollectionContentsAsSummaryFactory.java | 2 +-
.../components/entity/fieldset/PropertyGroup.java | 2 +-
.../wicket/ui/components/layout/bs3/col/Col.java | 8 +-
.../scalars/string/StringPanelFactory.java | 2 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 21 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 6 +-
.../dom/actions/assoc/AssociatedActionDemo.java | 2 +-
.../java/domainapp/dom/actions/assoc/DemoItem.java | 2 +-
.../dom/actions/async/AsyncActionDemo.java | 2 +-
.../java/domainapp/dom/actions/async/DemoTask.java | 2 +-
.../domainapp/dom/actions/depargs/DemoItem.java | 2 +-
.../actions/depargs/DependentArgsActionDemo.java | 2 +-
.../main/java/domainapp/dom/error/ErrorDemo.java | 2 +-
.../java/domainapp/dom/homepage/DemoHomePage.java | 2 +-
.../src/main/java/domainapp/dom/jee/JeeDemo.java | 2 +-
.../src/main/java/domainapp/dom/tabs/TabDemo.java | 2 +-
.../java/domainapp/dom/tooltip/TooltipDemo.java | 2 +-
.../src/main/java/domainapp/dom/tree/FileNode.java | 2 +-
.../src/main/java/domainapp/dom/tree/TreeDemo.java | 5 +-
.../java/domainapp/dom/types/blob/BlobDemo.java | 2 +-
.../java/domainapp/dom/types/text/TextDemo.java | 2 +-
.../domainapp/dom/types/time/TemporalDemo.java | 2 +-
.../org/apache/isis/testdomain/jdo/BookDto.java | 75 ++++++
.../isis/testdomain/jdo/InventoryResource.java | 14 +-
...ntTestService.java => RestEndpointService.java} | 29 ++-
.../isis/testdomain/rest/RestServiceTest.java | 33 ++-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 13 +-
.../fixtures/fixturescripts/FixtureScript.java | 2 +-
.../fixturespec/FixtureScriptsDefault.java | 4 +-
.../secman/model/app/feature/ApplicationClass.java | 18 +-
.../model/app/feature/ApplicationClassAction.java | 20 +-
.../app/feature/ApplicationClassCollection.java | 15 +-
.../model/app/feature/ApplicationClassMember.java | 12 +-
.../app/feature/ApplicationClassProperty.java | 21 +-
.../app/feature/ApplicationFeatureViewModel.java | 27 +--
.../app/feature/ApplicationFeatureViewModels.java | 24 +-
.../model/app/feature/ApplicationPackage.java | 12 +-
.../app/feature/ApplicationPermission_feature.java | 3 +-
.../user/ApplicationUser_filterPermissions.java | 1 -
.../app/user/ApplicationUser_permissions.java | 3 +-
.../model/app/user/UserPermissionViewModel.java | 24 +-
.../dom/permission/ApplicationPermissionMenu.java | 15 +-
.../secman/model/dom/role/ApplicationRoleMenu.java | 18 +-
.../model/dom/tenancy/ApplicationTenancyMenu.java | 18 +-
.../secman/model/dom/user/ApplicationUserMenu.java | 7 -
.../secman/model/dom/user/HasUsername_open.java | 3 +-
.../jdo/dom/permission/ApplicationPermission.java | 42 ++--
.../secman/jdo/dom/role/ApplicationRole.java | 54 ++---
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 36 +--
.../secman/jdo/dom/user/ApplicationUser.java | 90 +++----
248 files changed, 2370 insertions(+), 1883 deletions(-)