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/09/16 10:13:24 UTC
[isis] 01/01: Merge pull request #127 from apache/ISIS-1976-squash
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0d5885e75037c833af4d2e1d661062cc8a27c03b
Merge: b76db5d 88929c7
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 16 11:13:18 2018 +0100
Merge pull request #127 from apache/ISIS-1976-squash
ISIS-1976: removes OA map, stream for metamodel, excising guava
.../org/apache/isis/applib/adapters/Parser.java | 10 +-
.../org/apache/isis/applib/adapters/Parser2.java | 29 -
.../appfeat/ApplicationFeatureRepository.java | 12 +-
.../applib/services/bookmark/BookmarkService.java | 2 +-
.../java/org/apache/isis/applib/util/ToString.java | 42 +-
.../jaxbadapters/PersistentEntitiesAdapter.java | 2 +-
.../jaxbadapters/PersistentEntityAdapter.java | 2 +-
.../isis/commons/internal/base/_NullSafe.java | 5 +-
.../_Predicates.java => base/_Tuples.java} | 45 +-
.../isis/commons/internal/collections/_Lists.java | 20 +
.../commons/internal/functions/_Predicates.java | 17 +
core/legacy/applib-legacy/.gitignore | 1 -
.../apache/isis/applib/DomainObjectContainer.java | 184 ------
.../apache/isis/applib/annotation/Encodable.java | 86 ---
.../isis/applib/annotation/MemberGroupLayout.java | 185 ------
.../apache/isis/applib/annotation/Parseable.java | 77 ---
.../isis/applib/fixtures/AbstractFixture.java | 184 ------
.../isis/applib/fixtures/AbstractFixtureSusa.java | 64 --
.../apache/isis/applib/fixtures/BaseFixture.java | 125 ----
.../apache/isis/applib/fixtures/DateFixture.java | 126 ----
.../isis/applib/fixtures/SwitchUserFixture.java | 108 ----
.../fixtures/switchuser/SwitchUserService.java | 59 --
.../switchuser/SwitchUserServiceAware.java | 37 --
.../applib/fixtures/switchuser/package-info.java | 28 -
.../java/org/apache/isis/applib/layout/Util.java | 51 --
.../component/CollectionLayoutData_legacy.java | 40 --
.../background/BackgroundCommandService2.java | 28 -
.../services/background/BackgroundService2.java | 28 -
.../ExceptionRecognizerAbstractLegacy.java | 178 ------
.../ExceptionRecognizerForTypeLegacy.java | 148 -----
.../applib/services/memento/MementoService.java | 118 ----
.../isis/applib/services/memento/package-info.java | 29 -
.../repository/RepositoryServiceLegacy.java | 233 -------
...aseEncodingWithSupportForLargeUrlsAbstract.java | 87 ---
.../java/org/apache/isis/applib/util/Clause.java | 125 ----
.../isis/applib/util/ObjectContractsLegacy.java | 286 ---------
.../java/org/apache/isis/applib/value/Date.java | 297 ---------
.../org/apache/isis/applib/value/DateTime.java | 314 ----------
.../java/org/apache/isis/applib/value/Time.java | 263 --------
.../org/apache/isis/applib/value/TimeStamp.java | 79 ---
.../MemberGroupLayoutColumnSpansTest.java | 41 --
.../ExceptionRecognizerForTypeLegacyTest.java | 78 ---
.../ExceptionRecognizerGeneralLegacyTest.java | 67 --
.../java/org/apache/isis/applib/util/Invoice.java | 38 --
.../org/apache/isis/applib/util/InvoiceItem.java | 73 ---
.../apache/isis/applib/util/NumberedEvaluator.java | 32 -
.../util/ObjectContractsLegacyTest_compareTo.java | 77 ---
.../util/ObjectContractsLegacyTest_equals.java | 91 ---
...ectContractsLegacyTest_equals_and_hashCode.java | 124 ----
.../util/ObjectContractsLegacyTest_toString.java | 132 ----
.../org/apache/isis/applib/value/DateTest.java | 179 ------
.../org/apache/isis/applib/value/DateTimeTest.java | 186 ------
.../apache/isis/applib/value/TimeStampTest.java | 61 --
.../org/apache/isis/applib/value/TimeTest.java | 127 ----
.../integtestsupport/IntegrationTestAbstract.java | 280 ---------
.../integtestsupport/IntegrationTestAbstract2.java | 127 ----
.../core/integtestsupport/IsisSystemForTest.java | 687 ---------------------
.../scenarios/ScenarioExecutionForIntegration.java | 114 ----
core/legacy/integtestsupport-legacy/test.data | 5 -
core/legacy/metamodel-legacy/.gitignore | 1 -
.../annotcfg/EncodableFacetAnnotation.java | 58 --
...bleFacetAnnotationElseConfigurationFactory.java | 79 ---
.../membergroups/MemberGroupLayoutFacet.java | 47 --
.../MemberGroupLayoutFacetAbstract.java | 82 ---
.../MemberGroupLayoutFacetAnnotation.java | 38 --
.../annotprop/MemberGroupLayoutFacetFactory.java | 123 ----
.../annotprop/MemberGroupLayoutFacetFallback.java | 38 --
.../MemberGroupLayoutFacetProperties.java | 71 ---
.../annotcfg/ParseableFacetAnnotation.java | 67 --
...bleFacetAnnotationElseConfigurationFactory.java | 84 ---
...ateValueFacetUsingSemanticsProviderFactory.java | 45 --
.../value/date/DateValueSemanticsProvider.java | 68 --
...imeValueFacetUsingSemanticsProviderFactory.java | 45 --
.../datetime/DateTimeValueSemanticsProvider.java | 69 ---
...imeValueFacetUsingSemanticsProviderFactory.java | 45 --
.../value/time/TimeValueSemanticsProvider.java | 88 ---
...ampValueFacetUsingSemanticsProviderFactory.java | 45 --
.../timestamp/TimeStampValueSemanticsProvider.java | 85 ---
.../TimeStampValueSemanticsProviderAbstract.java | 105 ----
.../container/DomainObjectContainerDefault.java | 240 -------
.../services/grid/fixedcols/applib/Hint.java | 40 --
.../RepositoryServiceLegacyInternalDefault.java | 263 --------
.../plugins/IsisTimeValuePropertyPlugin.java | 34 -
.../core/metamodel/spec/ObjectSpecifications.java | 84 ---
.../plugins/ProgrammingModelLegacyPlugin.java | 46 --
...core.metamodel.progmodel.ProgrammingModelPlugin | 1 -
...l.services.swagger.internal.ValuePropertyPlugin | 1 -
.../encodable/EncodableFacetFactoryTest.java | 209 -------
.../MemberGroupLayoutFacetFactoryTest.java | 110 ----
...oupLayoutFacetPropertiesTest_asColumnSpans.java | 69 ---
...GroupLayoutFacetPropertiesTest_asGroupList.java | 75 ---
...acetAnnotationElseConfigurationFactoryTest.java | 218 -------
.../value/DateTimeValueSemanticsProviderTest.java | 146 -----
.../value/DateValueSemanticsProviderTest.java | 154 -----
...JavaSqlTimeStampValueSemanticsProviderTest.java | 79 ---
.../value/TimeStampValueSemanticsProviderTest.java | 78 ---
.../value/TimeValueSemanticsProviderTest.java | 123 ----
.../metamodel/spec/ObjectSpecificationsTest.java | 82 ---
core/legacy/runtime-legacy/.gitignore | 1 -
.../runtime/fixtures/SwitchUserServiceImpl.java | 88 ---
.../core/runtime/services/memento/Dom4jUtil.java | 278 ---------
.../services/memento/MementoServiceDefault.java | 172 ------
.../memento/MementoServiceDefaultTest.java | 99 ---
.../spec/feature/ObjectAssociationFilters.java | 256 --------
core/legacy/unittestsupport-legacy/.gitignore | 1 -
.../jmocking/JavassistImposteriser.java | 136 ----
.../jmocking/JavassistImposteriserTest.java | 317 ----------
core/legacy/viewer-wicket-ui-legacy/.gitignore | 1 -
.../isisapplib/ApplibDateConverterPlugin.java | 42 --
.../isisapplib/DateConverterForApplibDate.java | 54 --
.../isisapplib/DateConverterForApplibDateTime.java | 50 --
.../scalars/isisapplib/IsisDatePanel.java | 42 --
.../scalars/isisapplib/IsisDatePanelFactory.java | 44 --
.../scalars/isisapplib/IsisDateTimePanel.java | 51 --
.../isisapplib/IsisDateTimePanelFactory.java | 44 --
.../scalars/isisapplib/IsisTimePanelFactory.java | 44 --
.../scalars/isisapplib/IsisTimeStampPanel.java | 43 --
.../isisapplib/IsisTimeStampPanelFactory.java | 44 --
...g.apache.isis.viewer.wicket.ui.ComponentFactory | 4 -
...icket.ui.components.scalars.DateConverterPlugin | 1 -
.../isisapplib/DateConverterForApplibDateTest.java | 88 ---
.../DateConverterForApplibDateTimeTest.java | 110 ----
core/mavendeps/webapp/pom.xml | 7 +-
.../AuthenticationSessionAbstract.java | 4 +-
.../core/commons/authentication/MessageBroker.java | 6 +-
.../core/commons/components/InstallerAbstract.java | 15 +-
.../commons/config/IsisConfigurationDefault.java | 4 +-
.../configbuilder/IsisConfigurationBuilder.java | 9 +-
.../PrimerForEnvironmentVariableISIS_OPTS.java | 5 +-
.../isis/core/commons/encoding/FieldType.java | 3 +-
.../apache/isis/core/commons/ensure/Assert.java | 10 +-
.../isis/core/commons/lang/ArrayExtensions.java | 9 +-
.../isis/core/commons/lang/ClassFunctions.java | 4 +-
.../isis/core/commons/lang/ClassPredicates.java | 4 +-
.../apache/isis/core/commons/lang/ClassUtil.java | 4 +-
.../isis/core/commons/lang/ListExtensions.java | 19 +-
.../commons/lang/MethodInvocationPreprocessor.java | 31 +-
.../apache/isis/core/commons/lang/MethodUtil.java | 7 +-
.../isis/core/commons/lang/StringExtensions.java | 4 +-
.../isis/core/commons/lang/StringFunctions.java | 59 --
.../isis/core/commons/lang/StringPredicates.java | 41 --
.../isis/core/commons/matchers/package-info.java | 24 -
.../isis/core/metamodel/adapter/ObjectAdapter.java | 129 ++--
.../adapter/ObjectAdapterByIdProvider.java | 86 +++
.../metamodel/adapter/ObjectAdapterProvider.java | 74 ++-
.../isis/core/metamodel/adapter/oid/Oid.java | 19 +-
.../core/metamodel/adapter/oid/OidMarshaller.java | 4 +-
.../adapter/oid/ParentedCollectionOid.java | 21 +-
.../isis/core/metamodel/adapter/oid/RootOid.java | 64 +-
.../isis/core/metamodel/adapter/oid/TypedOid.java | 30 -
.../adapter/version/ConcurrencyException.java | 1 -
.../core/metamodel/facetapi/FacetAbstract.java | 11 +-
.../isis/core/metamodel/facetapi/FacetHolder.java | 22 +-
.../core/metamodel/facetapi/FacetHolderImpl.java | 35 +-
.../isis/core/metamodel/facetapi/FacetUtil.java | 102 +--
.../core/metamodel/facetapi/MultiTypedFacet.java | 4 +-
.../isis/core/metamodel/facets/Annotations.java | 15 +-
.../core/metamodel/facets/CollectionUtils.java | 3 +-
.../facets/ContributeeMemberFacetFactory.java | 2 -
.../core/metamodel/facets/DomainEventHelper.java | 24 +-
.../isis/core/metamodel/facets/FacetedMethod.java | 5 +-
.../core/metamodel/facets/ImperativeFacet.java | 30 +-
.../MethodPrefixBasedFacetFactoryAbstract.java | 22 +-
.../metamodel/facets/MultiTypedFacetAbstract.java | 57 --
...nChoicesForCollectionParameterFacetFactory.java | 17 +-
.../invocation/ActionDomainEventFacetAbstract.java | 29 +-
...ctionInvocationFacetForDomainEventAbstract.java | 43 +-
.../method/ActionDefaultsFacetViaMethod.java | 5 +-
.../ActionDefaultsFacetViaMethodFactory.java | 2 +-
.../annotation/HomePageFacetAnnotationFactory.java | 33 +-
.../CssClassFacetForActionLayoutAnnotation.java | 1 +
.../DescribedAsFacetForActionLayoutAnnotation.java | 1 +
.../NamedFacetForActionLayoutAnnotation.java | 1 +
...dFacetDerivedFromDomainServiceFacetFactory.java | 1 +
...uFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
.../ActionParameterValidationFacetViaMethod.java | 1 +
.../ActionValidationFacetViaMethodFactory.java | 1 +
.../collections/CollectionFacetAbstract.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 6 +-
...abledFacetOnCollectionDerivedFromImmutable.java | 2 +-
...CssClassFacetForCollectionLayoutAnnotation.java | 1 +
...cribedAsFacetForCollectionLayoutAnnotation.java | 1 +
.../NamedFacetForCollectionLayoutAnnotation.java | 1 +
.../collections/modify/CollectionFacetUtils.java | 1 +
.../ParentedFacetSinceCollectionFactory.java | 2 +-
.../annotation/SortedByFacetAnnotationFactory.java | 10 +-
.../facets/fallback/FallbackFacetFactory.java | 16 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 24 +-
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 2 +-
.../CssClassFaFacetOnMemberFromProperties.java | 2 +-
.../DisableForSessionFacetViaMethodFactory.java | 1 +
.../method/DisableForContextFacetViaMethod.java | 6 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 20 +-
.../HiddenFacetFromLayoutPropertiesAbstract.java | 1 +
.../HideForSessionFacetViaMethodFactory.java | 2 +-
.../method/HideForContextFacetViaMethod.java | 4 +-
.../HideForContextFacetViaMethodFactory.java | 2 +-
.../members/order/MemberOrderFacetAbstract.java | 1 +
.../BookmarkPolicyFacetFallbackFactory.java | 20 +-
.../facets/object/callbacks/CallbackFacet.java | 6 +-
.../object/callbacks/CallbackFacetAbstract.java | 7 +-
.../callbacks/CreatedCallbackFacetFactory.java | 2 +-
.../callbacks/CreatedCallbackFacetViaMethod.java | 3 +-
.../object/callbacks/LoadCallbackFacetFactory.java | 2 +-
.../callbacks/LoadedCallbackFacetAbstract.java | 2 -
.../callbacks/LoadedCallbackFacetViaMethod.java | 3 +-
.../callbacks/LoadingCallbackFacetAbstract.java | 2 -
.../callbacks/LoadingCallbackFacetViaMethod.java | 3 +-
.../callbacks/PersistCallbackFacetFactory.java | 2 +-
.../PersistCallbackViaSaveMethodFacetFactory.java | 2 +-
.../callbacks/PersistedCallbackFacetAbstract.java | 2 -
.../callbacks/PersistedCallbackFacetViaMethod.java | 3 +-
.../callbacks/PersistingCallbackFacetAbstract.java | 2 -
.../PersistingCallbackFacetViaMethod.java | 3 +-
.../callbacks/RemoveCallbackFacetFactory.java | 2 +-
.../RemoveCallbackViaDeleteMethodFacetFactory.java | 2 +-
.../callbacks/RemovedCallbackFacetViaMethod.java | 3 +-
.../callbacks/RemovingCallbackFacetAbstract.java | 2 -
.../callbacks/RemovingCallbackFacetViaMethod.java | 3 +-
.../callbacks/UpdateCallbackFacetFactory.java | 2 +-
.../callbacks/UpdatedCallbackFacetAbstract.java | 2 -
.../callbacks/UpdatedCallbackFacetViaMethod.java | 3 +-
.../callbacks/UpdatingCallbackFacetAbstract.java | 2 -
.../callbacks/UpdatingCallbackFacetViaMethod.java | 11 +-
.../choices/enums/EnumValueSemanticsProvider.java | 2 +-
.../cssclass/method/CssClassFacetMethod.java | 1 +
.../method/CssClassFacetMethodFactory.java | 1 +
.../object/defaults/DefaultsProviderUtil.java | 1 -
.../annotcfg/DefaultedFacetAnnotation.java | 2 +-
.../annotcfg/DefaultedFacetFromConfiguration.java | 2 +-
...AutoCompleteFacetForAutoCompleteAnnotation.java | 1 -
...ObjectSpecIdFacetForDomainObjectAnnotation.java | 1 +
...cIdFacetForJdoPersistenceCapableAnnotation.java | 2 +
...scribedAsFacetForViewModelLayoutAnnotation.java | 1 +
.../NamedFacetForDomainObjectLayoutAnnotation.java | 1 +
.../NamedFacetForViewModelLayoutAnnotation.java | 2 -
.../PluralFacetForViewModelLayoutAnnotation.java | 1 +
.../DomainServiceFacetAnnotationFactory.java | 19 +-
...NamedFacetForDomainServiceLayoutAnnotation.java | 1 +
.../object/encodeable/EncoderDecoderUtil.java | 1 -
.../facets/object/facets/FacetsFacetAbstract.java | 1 -
.../hidden/method/HiddenObjectFacetViaMethod.java | 2 +-
.../method/HiddenObjectFacetViaMethodFactory.java | 4 +-
.../object/icon/method/IconFacetMethodFactory.java | 2 +-
...oveDatanucleusPersistableTypesFacetFactory.java | 5 +-
.../ignore/javalang/RemoveMethodsFacetFactory.java | 16 +-
.../jdo/RemoveJdoEnhancementTypesFacetFactory.java | 5 +-
.../method/NavigableParentFacetMethodFactory.java | 2 +-
...jectSpecIdFacetDerivedFromClassNameFactory.java | 11 +-
...erivedFromDomainServiceAnnotationElseGetId.java | 2 -
.../ObjectValidPropertiesFacet.java | 1 -
.../impl/ObjectValidPropertiesFacetImpl.java | 19 +-
.../facets/object/parseable/ParserUtil.java | 1 +
...tyDerivedFromRecreatableObjectFacetFactory.java | 1 +
...ObjectFacetDeclarativeInitializingAbstract.java | 35 +-
.../annotation/TitleAnnotationFacetFactory.java | 7 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 11 +-
.../title/methods/TitleFacetViaMethodsFactory.java | 4 +-
...cationFromMustSatisfyAnnotationOnTypeFacet.java | 2 +-
.../method/ValidateObjectFacetMethodFactory.java | 2 +-
.../facets/object/value/EqualByContentFacet.java | 1 -
...Parser2.java => MaxLengthFacetUsingParser.java} | 8 +-
.../facets/object/value/ValueFacetAbstract.java | 26 +-
.../value/annotcfg/ValueFacetAnnotation.java | 1 -
...ValueFacetAnnotationOrConfigurationFactory.java | 1 -
.../annotcfg/ValueFacetFromConfiguration.java | 2 -
.../ValueFacetUsingSemanticsProviderFactory.java | 1 -
.../ValueSemanticsProviderAndFacetAbstract.java | 9 +-
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 3 +-
.../MustSatisfySpecificationFacetAbstract.java | 5 +-
.../method/ActionChoicesFacetViaMethod.java | 4 +-
.../ActionParameterChoicesFacetViaMethod.java | 2 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 1 -
.../ActionParameterDefaultsFacetAbstract.java | 1 -
...arameterDefaultFacetDerivedFromTypeFactory.java | 2 +-
.../ActionParameterDefaultsFacetViaMethod.java | 4 +-
.../CssClassFacetForParameterLayoutAnnotation.java | 1 +
...scribedAsFacetForParameterLayoutAnnotation.java | 1 +
.../NamedFacetForParameterLayoutAnnotation.java | 1 -
.../PropertyOrCollectionAccessorFacetAbstract.java | 7 -
.../PropertyAutoCompleteFacetAbstract.java | 1 -
.../defaults/PropertyDefaultFacetAbstract.java | 1 -
.../hidden/HiddenFacetForPropertyAnnotation.java | 2 -
.../modify/PropertyDomainEventFacetAbstract.java | 6 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 14 +-
.../regex/RegExFacetForPropertyAnnotation.java | 2 +
.../CssClassFacetForPropertyLayoutAnnotation.java | 1 +
...escribedAsFacetForPropertyLayoutAnnotation.java | 1 +
.../update/PropertySetAndClearFacetFactory.java | 1 +
.../core/metamodel/facets/value/JodaFunctions.java | 3 +-
.../ValueSemanticsProviderAbstractTemporal.java | 2 +-
.../value/bigdecimal/BigDecimalValueFacet.java | 6 +-
.../bigdecimal/BigDecimalValueFacetAbstract.java | 5 -
.../BigDecimalValueSemanticsProvider.java | 9 +-
.../BigIntegerValueSemanticsProvider.java | 2 +-
.../value/blobs/BlobValueSemanticsProvider.java | 2 +-
.../BooleanWrapperValueSemanticsProvider.java | 1 -
.../value/clobs/ClobValueSemanticsProvider.java | 2 +-
.../value/color/ColorValueSemanticsProvider.java | 2 +-
.../value/datejdk8local/Jdk8LocalDateUtil.java | 3 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 8 +-
.../value/datejodalocal/JodaLocalDateUtil.java | 5 +-
.../JodaLocalDateValueSemanticsProvider.java | 4 +-
.../datesql/JavaSqlDateValueSemanticsProvider.java | 1 -
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 13 +-
.../JodaDateTimeValueSemanticsProvider.java | 9 +-
.../datetimejodalocal/JodaLocalDateTimeUtil.java | 5 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 4 +-
.../JavaUtilDateValueSemanticsProvider.java | 1 -
.../image/ImageValueSemanticsProviderAbstract.java | 2 +-
...ageValueFacetUsingSemanticsProviderFactory.java | 1 +
.../value/markup/MarkupValueSemanticsProvider.java | 2 +-
.../value/money/MoneyValueSemanticsProvider.java | 4 +-
.../password/PasswordValueSemanticsProvider.java | 2 +-
.../PercentageValueSemanticsProvider.java | 3 +-
.../value/string/StringValueSemanticsProvider.java | 2 +-
...imeValueFacetUsingSemanticsProviderFactory.java | 1 +
.../timesql/JavaSqlTimeValueSemanticsProvider.java | 1 -
...ampValueFacetUsingSemanticsProviderFactory.java | 1 +
.../treenode/TreeNodeValueSemanticsProvider.java | 2 +-
...URLValueFacetUsingSemanticsProviderFactory.java | 1 +
.../interactions/ActionArgValidityContext.java | 4 +-
.../interactions/ActionUsabilityContext.java | 4 +-
.../interactions/ActionValidityContext.java | 4 +-
.../interactions/ActionVisibilityContext.java | 4 +-
.../interactions/CollectionAccessContext.java | 4 +-
.../interactions/CollectionRemoveFromContext.java | 4 +-
.../interactions/CollectionVisibilityContext.java | 4 +-
.../metamodel/interactions/InteractionContext.java | 14 +-
.../metamodel/interactions/InteractionUtils.java | 27 +-
.../metamodel/interactions/ObjectTitleContext.java | 4 +-
.../interactions/ObjectValidityContext.java | 4 +-
.../interactions/ObjectVisibilityContext.java | 4 +-
.../metamodel/interactions/ParseValueContext.java | 4 +-
.../interactions/PropertyAccessContext.java | 4 +-
.../interactions/PropertyModifyContext.java | 4 +-
.../interactions/PropertyUsabilityContext.java | 4 +-
.../interactions/PropertyVisibilityContext.java | 4 +-
.../isis/core/metamodel/layout/DeweyOrderSet.java | 5 +-
...onParameterDefaultsAndChoicesPostProcessor.java | 28 +-
.../core/metamodel/progmodel/DeprecatedMarker.java | 2 -
.../progmodel/ProgrammingModelAbstract.java | 9 +-
.../core/metamodel/services/ServicesInjector.java | 8 +
.../services/appfeat/ApplicationFeature.java | 58 +-
.../services/appfeat/ApplicationFeatureId.java | 167 ++---
.../ApplicationFeatureRepositoryDefault.java | 79 +--
.../bookmarks/BookmarkServiceInternalDefault.java | 4 +-
.../config/ConfigurationServiceDefault.java | 5 +-
.../services/grid/GridLoaderServiceDefault.java | 11 +-
.../services/grid/GridServiceDefault.java | 23 +-
.../services/grid/GridSystemServiceAbstract.java | 39 +-
.../grid/bootstrap3/GridSystemServiceBS3.java | 216 +++----
.../services/layout/LayoutServiceDefault.java | 11 +-
.../services/metamodel/DomainMemberDefault.java | 8 +-
.../metamodel/MetaModelServiceDefault.java | 68 +-
.../PersistenceSessionServiceInternal.java | 10 +-
.../PersistenceSessionServiceInternalNoop.java | 15 +-
.../services/swagger/internal/Generation.java | 17 +-
.../metamodel/services/swagger/internal/Util.java | 30 +-
.../swagger/internal/ValuePropertyFactory.java | 19 +-
.../apache/isis/core/metamodel/spec/Instance.java | 41 ++
.../core/metamodel/spec/ObjectAdapterUtils.java | 57 --
.../core/metamodel/spec/ObjectSpecification.java | 15 +-
.../core/metamodel/spec/feature/CurrentHolder.java | 1 -
.../core/metamodel/spec/feature/ObjectAction.java | 144 ++---
.../spec/feature/ObjectActionContainer.java | 19 +-
.../spec/feature/ObjectActionParameter.java | 26 +-
.../core/metamodel/spec/feature/ObjectActions.java | 49 --
.../metamodel/spec/feature/ObjectAssociation.java | 59 +-
.../spec/feature/ObjectAssociationContainer.java | 30 +-
.../core/metamodel/spec/feature/ObjectMember.java | 34 +-
.../spec/feature/OneToManyAssociation.java | 4 -
.../specloader/InjectorMethodEvaluatorDefault.java | 3 +
.../metamodel/specloader/ServiceInitializer.java | 4 +
.../metamodel/specloader/SpecificationLoader.java | 31 +-
.../classsubstitutor/ClassSubstitutor.java | 4 +-
.../specloader/facetprocessor/FacetProcessor.java | 15 +-
.../specloader/specimpl/ContributeeMember.java | 19 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 31 +-
.../specimpl/ObjectActionContributee.java | 19 +-
.../specloader/specimpl/ObjectActionDefault.java | 12 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 4 +-
.../specimpl/ObjectActionParameterAbstract.java | 23 +-
.../specimpl/ObjectAssociationAbstract.java | 4 -
.../specloader/specimpl/ObjectMemberAbstract.java | 12 +-
.../specimpl/ObjectSpecificationAbstract.java | 443 ++++++-------
.../specimpl/OneToManyAssociationDefault.java | 10 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 124 ++--
.../validator/MetaModelValidatorComposite.java | 5 +-
.../MetaModelValidatorToCheckModuleExtent.java | 27 +-
...taModelValidatorToCheckObjectSpecIdsUnique.java | 6 +-
.../validator/MetaModelValidatorVisiting.java | 5 +-
.../specloader/validator/ValidationFailures.java | 1 +
.../AuthenticationRequestAbstract.java | 4 +-
.../standard/AuthenticationManagerStandard.java | 15 +-
.../standard/AuthenticatorFuncs.java | 4 +-
.../runtime/authentication/standard/Registrar.java | 17 +-
.../isis/core/runtime/snapshot/XmlSchema.java | 49 +-
.../isis/core/runtime/snapshot/XmlSnapshot.java | 7 +-
.../system/transaction/TransactionalClosure.java | 25 -
.../core/runtime/threadpool/ThreadPoolSupport.java | 5 +-
.../core/webapp/content/ResourceCachingFilter.java | 49 +-
.../isis/core/webapp/content/ResourceServlet.java | 11 +-
.../JdoDiscriminatorAnnotationFacetFactory.java | 1 +
...DerivedFromJdoColumnAnnotationFacetFactory.java | 29 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 22 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 22 +-
.../util/JdoPrimaryKeyPropertyPredicate.java | 5 +-
.../dflt/ProgrammingModelFacetsJava5.java | 8 +-
.../core/commons/lang/ListUtilsTest_adjust.java | 8 +-
.../core/commons/lang/ListUtilsTest_insert.java | 10 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 4 +-
.../core/metamodel/facets/CollectionUtilsTest.java | 4 +-
.../metamodel/facets/ObjectAdapterUtilsTest.java | 11 +-
.../TitleFacetViaTitleAnnotationTest.java | 7 +-
...ValidationDigitsAnnotationFacetFactoryTest.java | 4 +-
...jectAssociationPredicatesTest_visibleWhere.java | 61 +-
.../interactions/InteractionUtils_isA_Test.java | 10 +-
...rvicesInjectorDefaultTest_validateServices.java | 4 +-
.../services/appfeat/ApplicationFeatureIdTest.java | 18 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 26 +-
.../core/metamodel/services/grid/BS3GridTest.java | 10 +-
.../specloader/ServiceInitializerTest.java | 15 +-
.../SpecificationLoaderTestAbstract.java | 4 +-
...ionParameterAbstractTest_getId_and_getName.java | 10 +-
.../testspec/ObjectSpecificationStub.java | 55 +-
.../system/persistence/PersistenceSession4.java | 653 +++-----------------
.../persistence/PersistenceSession4_Decouple.java | 213 -------
.../plugins/jdo/dn4/IsisJdoSupportPlugin4.java | 2 +-
...ache.isis.core.metamodel.IsisJdoMetamodelPlugin | 2 +-
...apache.isis.core.metamodel.IsisJdoRuntimePlugin | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 15 +-
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 4 +-
.../system/persistence/PersistenceSession5.java | 645 +++----------------
.../queries/PersistenceQueryProcessorAbstract.java | 3 +-
.../plugins/jdo/dn5/IsisJdoSupportPlugin5.java | 2 +-
...ache.isis.core.metamodel.IsisJdoMetamodelPlugin | 2 +-
...apache.isis.core.metamodel.IsisJdoRuntimePlugin | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 15 +-
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 4 +-
core/{ => plugins}/security-shiro/NOTICE | 0
core/{ => plugins}/security-shiro/pom.xml | 10 +-
.../appended-resources/supplemental-models.xml | 0
.../security/shiro/IsisLdapContextFactory.java | 0
.../apache/isis/security/shiro/IsisLdapRealm.java | 0
.../shiro/ShiroAuthenticatorOrAuthorizor.java | 0
.../apache/isis/security/shiro/ShiroConstants.java | 0
.../ShiroAuthenticationManagerInstaller.java | 0
.../shiro/authorization/IsisPermission.java | 0
.../authorization/IsisPermissionResolver.java | 0
.../ShiroAuthorizationManagerInstaller.java | 0
.../permrolemapper/PermissionToRoleMapper.java | 0
.../PermissionToRoleMapperFromIni.java | 0
.../PermissionToRoleMapperFromString.java | 0
.../org/apache/isis/security/shiro/util/Util.java | 0
.../shiro/IsisPermissionTest_setParts.java | 0
.../shiro/IsisPermissionTest_typicalUsage.java | 0
...AuthenticatorOrAuthorizorTest_authenticate.java | 0
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 0
.../authorization/IsisPermissionTest_equals.java | 0
.../PermissionToRoleMapperFromIniTest.java | 0
.../PermissionToRoleMapperFromStringTest.java | 0
.../isis/security/shiro/util/UtilTest_parse.java | 0
.../isis/security/shiro/permrolemapper/my.ini | 0
.../security-shiro/src/test/resources/shiro.ini | 0
core/pom.xml | 15 +-
.../isis/core/runtime/memento/CollectionData.java | 2 +-
.../apache/isis/core/runtime/memento/Memento.java | 30 +-
.../runtime/persistence/adapter/PojoAdapter.java | 31 +-
.../background/CommandExecutorServiceDefault.java | 34 +-
.../background/CommandInvocationHandler.java | 25 +-
.../changes/ChangedObjectsServiceInternal.java | 111 ++--
.../homepage/HomePageProviderServiceDefault.java | 17 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 19 +-
.../PersistenceSessionServiceInternalDefault.java | 52 +-
.../AbstractIsisSessionTemplate.java | 10 +-
.../system/persistence/PersistenceSession.java | 176 +++---
.../system/persistence/PersistenceSessionBase.java | 11 +-
.../adaptermanager/ObjectAdapterContext.java | 439 ++++---------
.../ObjectAdapterContext_AdapterManager.java | 207 -------
.../ObjectAdapterContext_Consistency.java | 143 -----
.../ObjectAdapterContext_DependencyInjection.java | 88 +++
.../ObjectAdapterContext_Factories.java | 11 +-
...ObjectAdapterContext_LifecycleEventSupport.java | 97 +++
.../ObjectAdapterContext_MementoSupport.java | 32 +-
.../ObjectAdapterContext_NewIdentifier.java | 64 +-
...tAdapterContext_ObjectAdapterByIdProvider.java} | 156 +++--
...ObjectAdapterContext_ObjectAdapterProvider.java | 172 ++----
.../ObjectAdapterContext_ObjectCreation.java | 160 +++++
.../adaptermanager/OidAdapterHashMap.java | 106 ----
.../persistence/adaptermanager/OidProviders.java | 140 +++++
.../adaptermanager/PojoAdapterHashMap.java | 138 -----
.../adaptermanager/RootAndCollectionAdapters.java | 128 ----
.../adaptermanager/factories/OidFactory.java} | 42 +-
.../factories/OidFactory_Builder.java | 71 +++
.../system/transaction/IsisTransactionManager.java | 24 +-
.../transaction/TransactionalClosureAbstract.java | 30 -
.../TransactionalClosureWithReturn.java | 25 -
.../TransactionalClosureWithReturnAbstract.java | 30 -
.../IsisComponentProvider.java | 3 +-
.../apache/isis/core/webapp/modules/WebModule.java | 1 +
.../core/webapp/modules/WebModule_RestEasy.java | 11 +-
.../webapp/modules/WebModule_StaticResources.java | 79 +++
.../datanucleus/metamodel/JdoPropertyUtils.java | 18 +-
.../domainobjects/DomainObjectReprRenderer.java | 34 +-
.../domaintypes/DomainTypeReprRenderer.java | 22 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 25 +-
.../ExceptionMapperForRuntimeException.java | 42 +-
.../resources/DomainObjectResourceServerside.java | 2 +-
.../resources/ObjectAdapterUpdateHelper.java | 173 +++---
.../restfulobjects/server/util/OidUtils.java | 64 +-
.../IsisTransactionFilterForRestfulObjects.java | 7 +-
.../wicket/ConverterForObjectAdapter.java | 6 +-
.../wicket/ConverterForObjectAdapterMemento.java | 9 +-
.../integration/wicket/WebRequestCycleForIsis.java | 4 +-
.../wicket/model/models/BookmarkTreeNode.java | 45 +-
.../wicket/model/models/EntityCollectionModel.java | 12 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../collection/AssociatedWithActionsHelper.java | 21 +-
.../collection/bulk/BulkActionsHelper.java | 8 +-
.../CollectionContentsAsAjaxTablePanel.java | 64 +-
.../summary/CollectionContentsAsSummary.java | 15 +-
.../CollectionContentsAsSummaryFactory.java | 19 +-
.../ui/pages/accmngt/register/RegisterPanel.java | 6 +-
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 19 +-
.../DelegatingInvocationHandlerDefault.java | 7 +-
.../handlers/DomainObjectInvocationHandler.java | 66 +-
.../src/main/webapp/WEB-INF/logging.properties | 2 -
.../src/main/webapp/WEB-INF/logging.properties | 2 -
529 files changed, 4033 insertions(+), 17291 deletions(-)