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 2018/10/08 22:18:05 UTC
[isis] 01/03: Merge branch 'ISIS-2003'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b92c24ae4b7208635d47e58dccb22f0050c6ea4
Merge: 4919e6c cee7921
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 8 18:49:40 2018 +0100
Merge branch 'ISIS-2003'
# Conflicts:
# core/pom.xml
.../isis/applib/annotation/MemberGroupLayout.java | 4 +
.../services/metamodel/MetaModelService6.java} | 39 +-
.../metamodel/MetaModelService6_Flags_Test.java | 28 +
.../apache/isis/core/metamodel/facetapi/Facet.java | 2 +-
.../core/metamodel/facetapi/FacetAbstract.java | 44 +-
.../FacetWithAttributes.java} | 19 +-
.../core/metamodel/facets/ImperativeFacet.java | 12 +
.../metamodel/facets/MultiTypedFacetAbstract.java | 7 +
.../facets/SingleClassValueFacetAbstract.java | 7 +
.../facets/SingleIntValueFacetAbstract.java | 8 +
.../facets/SingleStringValueFacetAbstract.java | 6 +
.../metamodel/facets/SingleValueFacetAbstract.java | 7 +-
.../facets/WhenAndWhereValueFacetAbstract.java | 9 +
.../metamodel/facets/WhenValueFacetAbstract.java | 9 +
...ctionInvocationFacetForDomainEventAbstract.java | 11 +
.../actions/command/CommandFacetAbstract.java | 11 +
.../method/ActionDefaultsFacetViaMethod.java | 18 +-
.../PromptStyleFacetForActionLayoutAnnotation.java | 8 +
.../layout/PromptStyleFacetForActionXml.java | 8 +
...omptStyleFacetOnActionFromLayoutProperties.java | 6 +
.../NotContributedFacetAbstract.java | 7 +
...tributedFacetDerivedFromDomainServiceFacet.java | 7 +
...viceMenuFacetDerivedFromDomainServiceFacet.java | 7 +
.../method/NotInServiceMenuFacetViaMethod.java | 13 +-
.../position/ActionPositionFacetAbstract.java | 7 +
.../actions/prototype/PrototypeFacetAbstract.java | 7 +
.../ActionParameterValidationFacetViaMethod.java | 7 +
.../method/ActionValidationFacetViaMethod.java | 6 +
.../all/i18n/DescribedAsFacetTranslated.java | 10 +-
.../facets/all/i18n/NamedFacetTranslated.java | 8 +
.../facets/all/i18n/PluralFacetTranslated.java | 7 +
.../facets/all/named/NamedFacetAbstract.java | 8 +
.../CollectionAccessorFacetViaAccessor.java | 6 +
.../clear/CollectionClearFacetViaAccessor.java | 6 +
.../clear/CollectionClearFacetViaClearMethod.java | 6 +
...ectionAddToFacetForDomainEventFromAbstract.java | 6 +
...nRemoveFromFacetForDomainEventFromAbstract.java | 7 +
.../modify/CollectionAddToFacetViaAccessor.java | 6 +
.../modify/CollectionAddToFacetViaMethod.java | 6 +
.../CollectionRemoveFromFacetViaAccessor.java | 6 +
.../modify/CollectionRemoveFromFacetViaMethod.java | 6 +
.../CollectionValidateAddToFacetViaMethod.java | 5 +
...CollectionValidateRemoveFromFacetViaMethod.java | 6 +
.../members/cssclass/CssClassFacetAbstract.java | 15 +-
.../cssclassfa/CssClassFaFacetAbstract.java | 5 +
.../staticmethod/DescribedAsFacetStaticMethod.java | 6 +
.../members/disabled/DisabledFacetAbstract.java | 9 +
.../disabled/DisabledFacetAbstractImpl.java | 7 +-
.../DisableForSessionFacetViaMethod.java | 6 +
.../method/DisableForContextFacetViaMethod.java | 6 +
.../forsession/HideForSessionFacetViaMethod.java | 6 +
.../method/HideForContextFacetViaMethod.java | 5 +
.../named/staticmethod/NamedFacetStaticMethod.java | 6 +
.../members/order/MemberOrderFacetAbstract.java | 8 +
.../object/audit/AuditableFacetAbstract.java | 6 +
.../autocomplete/AutoCompleteFacetAbstract.java | 8 +
.../BookmarkPolicyFacetAbstract.java | 6 +
.../callbacks/CreatedCallbackFacetViaMethod.java | 5 +
.../callbacks/LoadedCallbackFacetViaMethod.java | 6 +
.../callbacks/LoadingCallbackFacetViaMethod.java | 6 +
.../callbacks/PersistedCallbackFacetViaMethod.java | 6 +
.../PersistingCallbackFacetViaMethod.java | 6 +
.../callbacks/RemovedCallbackFacetViaMethod.java | 6 +
.../callbacks/RemovingCallbackFacetViaMethod.java | 6 +
.../callbacks/UpdatedCallbackFacetViaMethod.java | 6 +
.../callbacks/UpdatingCallbackFacetViaMethod.java | 7 +
.../object/choices/enums/ChoicesFacetEnum.java | 6 +
.../choices/enums/EnumValueSemanticsProvider.java | 6 +
.../cssclass/method/CssClassFacetMethod.java | 6 +
.../object/defaults/DefaultedFacetAbstract.java | 6 +
.../method/DisabledObjectFacetViaMethod.java | 6 +
.../ImmutableFacetForDomainObjectAnnotation.java | 9 +
.../editing/ImmutableFacetFromConfiguration.java | 7 +
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 6 +
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 7 +
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 7 +
.../domainservice/DomainServiceFacetAbstract.java | 8 +
...conFacetDerivedFromDomainServiceAnnotation.java | 7 +
.../DomainServiceLayoutFacetAbstract.java | 8 +
.../facets/object/facets/FacetsFacetAbstract.java | 6 +-
.../hidden/method/HiddenObjectFacetViaMethod.java | 5 +
.../facets/object/icon/method/IconFacetMethod.java | 6 +
.../facets/object/mask/TitleFacetBasedOnMask.java | 7 +
.../MemberGroupLayoutFacetAbstract.java | 10 +-
.../facets/object/mixin/MixinFacetAbstract.java | 6 +
.../objectspecid/ObjectSpecIdFacetAbstract.java | 7 +
.../facets/object/paged/PagedFacetAbstract.java | 6 +
.../promptStyle/PromptStyleFacetAsConfigured.java | 8 +
.../PromptStyleFacetFallBackToInline.java | 2 +
.../RecreatableObjectFacetAbstract.java | 7 +-
.../annotation/RegExFacetOnTypeAnnotation.java | 5 +
.../annotation/TitleFacetViaTitleAnnotation.java | 24 +
.../title/methods/TitleFacetViaTitleMethod.java | 7 +
.../title/methods/TitleFacetViaToStringMethod.java | 7 +
.../TypicalLengthFacetOnTypeAnnotation.java | 6 +
...cationFromMustSatisfyAnnotationOnTypeFacet.java | 5 +
.../method/ValidateObjectFacetMethod.java | 6 +
.../object/value/MaxLengthFacetUsingParser2.java | 6 +
.../ValueSemanticsProviderAndFacetAbstract.java | 11 +
.../objectvalue/labelat/LabelAtFacetAbstract.java | 6 +
.../mandatory/MandatoryFacetAbstract.java | 8 +
.../multiline/MultiLineFacetAbstract.java | 7 +
.../MustSatisfySpecificationFacetAbstract.java | 5 +
.../regex/TitleFacetFormattedByRegex.java | 6 +
.../RenderedAdjustedFacetAbstract.java | 6 +
.../ActionParameterAutoCompleteFacetViaMethod.java | 8 +
...rameterFromJavaxValidationDigitsAnnotation.java | 9 +
.../ActionParameterChoicesFacetAbstract.java | 1 +
.../method/ActionChoicesFacetViaMethod.java | 7 +
.../ActionParameterChoicesFacetViaMethod.java | 7 +
...ParameterDefaultFacetDerivedFromTypeFacets.java | 6 +
.../ActionParameterDefaultsFacetViaMethod.java | 6 +
...calLengthFacetForParameterLayoutAnnotation.java | 14 +-
.../regex/RegExFacetForParameterAnnotation.java | 7 +
.../RegExFacetFromRegExAnnotationOnParameter.java | 6 +
.../TypicalLengthFacetOnParameterAnnotation.java | 7 +
...picalLengthFacetOnParameterDerivedFromType.java | 7 +
.../PropertyOrCollectionAccessorFacetAbstract.java | 6 +
.../accessor/PropertyAccessorFacetViaAccessor.java | 6 +
.../method/PropertyAutoCompleteFacetMethod.java | 9 +
...ropertyFromJavaxValidationDigitsAnnotation.java | 9 +
.../method/PropertyChoicesFacetViaMethod.java | 11 +-
...pertyDefaultFacetDerivedFromDefaultedFacet.java | 6 +
.../method/PropertyDefaultFacetViaMethod.java | 8 +-
.../modify/PropertyDomainEventFacetAbstract.java | 8 +
...tySetterOrClearFacetForDomainEventAbstract.java | 8 +-
.../regex/RegExFacetForPropertyAnnotation.java | 7 +
.../RegExFacetForRegExAnnotationOnProperty.java | 7 +
...romptStyleFacetForPropertyLayoutAnnotation.java | 8 +
.../PromptStyleFacetForPropertyXml.java | 8 +
...ptStyleFacetOnPropertyFromLayoutProperties.java | 7 +
...icalLengthFacetForPropertyLayoutAnnotation.java | 15 +-
.../TypicalLengthFacetForPropertyXml.java | 15 +-
...lLengthFacetOnPropertyFromLayoutProperties.java | 17 +-
.../TypicalLengthFacetOnPropertyAnnotation.java | 7 +
...TypicalLengthFacetOnPropertyFromProperties.java | 6 +
...ypicalLengthFacetOnPropertyDerivedFromType.java | 7 +
.../clear/PropertyClearFacetViaClearMethod.java | 6 +
.../clear/PropertyClearFacetViaSetterMethod.java | 6 +
...PropertyInitializationFacetViaSetterMethod.java | 5 +
.../modify/PropertySetterFacetViaModifyMethod.java | 5 +
.../modify/PropertySetterFacetViaSetterMethod.java | 6 +
.../method/PropertyValidateFacetViaMethod.java | 5 +
.../ValueSemanticsProviderAbstractTemporal.java | 5 +
.../BigDecimalValueSemanticsProvider.java | 6 +-
.../BigIntegerValueSemanticsProvider.java | 5 +
.../bytes/ByteValueSemanticsProviderAbstract.java | 6 +
.../DoubleValueSemanticsProviderAbstract.java | 6 +
.../FloatValueSemanticsProviderAbstract.java | 5 +
.../integer/IntValueSemanticsProviderAbstract.java | 5 +
.../longs/LongValueSemanticsProviderAbstract.java | 5 +
.../value/money/MoneyValueSemanticsProvider.java | 8 +-
.../ShortValueSemanticsProviderAbstract.java | 6 +
.../interactions/InteractionAdvisorFacet.java | 6 +
...arameterChoicesFacetFromParentedCollection.java | 5 +
.../services/metamodel/MetaModelExporter.java | 464 +
.../metamodel/MetaModelServiceDefault.java | 20 +-
.../JdoDatastoreIdentityFacetAbstract.java | 7 +
.../JdoPersistenceCapableFacetAbstract.java | 9 +
.../facets/object/query/JdoQueryFacetAbstract.java | 6 +
.../BigDecimalFacetDerivedFromJdoColumn.java | 14 +-
core/schema/pom.xml | 1 +
.../resources/org/apache/isis/schema/bindings.xml | 13 +
.../apache/isis/schema/metamodel/metamodel-1.0.xsd | 289 +
example/application/simpleapp/application/pom.xml | 22 +-
.../application/integtests/tests/mml/.gitignore | 1 +
...MetaModelService_IntegTest.exports.approved.xml | 47128 +++++++++++++++++++
.../tests/mml/MetaModelService_IntegTest.java | 64 +
.../{ => tests/smoke}/Smoke_IntegTest.java | 3 +-
.../application/simpleapp/module-simple/pom.xml | 8 +-
example/application/simpleapp/webapp/pom.xml | 8 +
171 files changed, 49182 insertions(+), 86 deletions(-)