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 2019/10/24 10:14:30 UTC
[isis] branch ISIS-2062 updated (911e751 -> ecc4498)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 911e751 ISIS-2062: more messing with toc and menus
add 7b8f589 ISIS-2158: major(!) ... remove static reference to MetaModelContext
add e55cf7f ISIS-2158: refactoring Oid factories into 'metamodel'
add 0688cbe ISIS-2158: fixes launch of demo-app
add 50d8ea5 ISIS-2158: housekeeping: mementos
add b7f25b4 ISIS-2158: fixes blob demo
add e02c0173 ISIS-2158: fixes EntityPage creation from bookmarked pages
add ecc4498 Merge pull request #152 from apache/ISIS-2062
No new revisions were added by this update.
Summary of changes:
.../applib/services/command/CommandContext.java | 4 +-
.../applib/services/registry/ServiceRegistry.java | 9 +-
.../jaxbadapters/PersistentEntityAdapter.java | 18 +-
.../isis/commons/internal/base/_Strings.java | 25 +
.../apache/isis/commons/internal/base/_With.java | 3 +-
.../isis/commons/internal/collections/_Lists.java | 2 +-
.../commons/internal/collections/_Multimaps.java | 17 +
.../environment/IsisSystemEnvironment.java | 39 +-
.../isis/commons/internal/ioc/IocContainer.java | 78 ++
.../internal/ioc/spring/IocContainerSpring.java | 124 +++
.../isis/commons/internal/ioc/spring/_Spring.java | 175 ++---
.../org/apache/isis/config/IsisConfigModule.java | 5 +-
.../org/apache/isis/config/IsisConfiguration.java | 9 -
.../isis/config/IsisConfigurationLegacy.java | 4 +-
.../org/apache/isis/config}/SystemConstants.java | 35 +-
.../facets/object/mixin/MixinIntendedAs.java | 22 +-
.../facets/param/name/ParameterNameFacetTest.java | 10 +-
.../ServiceInjectorTestUsingCodegenPlugin.java | 13 +-
.../apache/isis/metamodel/IsisMetamodelModule.java | 7 +-
.../apache/isis/metamodel/MetaModelContext.java | 47 +-
...modelModule.java => MetaModelContextAware.java} | 8 +-
.../isis/metamodel/MetaModelContext_usingCDI.java | 173 -----
...gSpring.java => MetaModelContext_usingIoc.java} | 58 +-
.../apache/isis/metamodel/MetaModelContexts.java | 19 +-
.../isis/metamodel/adapter/ObjectAdapter.java | 2 +-
.../metamodel/adapter/oid/factory}/OidFactory.java | 30 +-
.../adapter/oid/factory}/OidFactory_Builder.java | 29 +-
.../oid/factory/OidFactory_OidProviders.java | 139 ++++
.../standard/AuthorizationFacetFactory.java | 5 +-
.../isis/metamodel/facetapi/FacetAbstract.java | 13 +-
.../isis/metamodel/facetapi/FacetHolder.java | 22 +-
.../isis/metamodel/facetapi/FacetHolderImpl.java | 32 +-
.../apache/isis/metamodel/facetapi/FacetUtil.java | 4 +-
.../isis/metamodel/facets/CollectionUtils.java | 17 +-
.../metamodel/facets/FacetFactoryAbstract.java | 30 +-
.../action/ActionAnnotationFacetFactory.java | 29 +-
.../ActionDefaultsFacetViaMethodFactory.java | 8 +-
.../actions/layout/ActionLayoutFacetFactory.java | 33 +-
.../semantics/ActionSemanticsFacetAbstract.java | 4 +-
.../ActionValidationFacetViaMethodFactory.java | 5 +-
.../facets/all/i18n/TranslationFacetFactory.java | 27 +-
.../CollectionAccessorFacetViaAccessorFactory.java | 5 +-
.../clear/CollectionClearFacetFactory.java | 5 +-
.../CollectionAnnotationFacetFactory.java | 16 +-
...cetOnCollectionDerivedFromImmutableFactory.java | 3 +-
.../layout/CollectionLayoutFacetFactory.java | 27 +-
...tionAddToRemoveFromAndValidateFacetFactory.java | 11 +-
.../facets/fallback/FallbackFacetFactory.java | 46 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 9 +-
...assFacetOnActionFromConfiguredRegexFactory.java | 5 +-
.../annotprop/CssClassFaFacetOnMemberFactory.java | 8 +-
.../DescribedAsFacetOnMemberAnnotation.java | 35 -
.../annotprop/DescribedAsFacetOnMemberFactory.java | 3 +-
.../DisableForSessionFacetViaMethodFactory.java | 7 +-
.../DisableForContextFacetViaMethodFactory.java | 3 +-
.../forsession/HideForSessionFacetAbstract.java | 3 +-
.../ViewModelSemanticCheckingFacetFactory.java | 7 +
.../BookmarkPolicyFacetFallbackFactory.java | 5 +-
.../callbacks/CreatedCallbackFacetFactory.java | 8 +-
.../object/callbacks/LoadCallbackFacetFactory.java | 9 +-
.../choices/ChoicesFacetFromBoundedAbstract.java | 3 +-
...ingValueFacetUsingSemanticsProviderFactory.java | 3 +-
.../method/CssClassFacetMethodFactory.java | 3 +-
...tedFacetAnnotationElseConfigurationFactory.java | 3 +-
.../DomainObjectAnnotationFacetFactory.java | 46 +-
.../DomainObjectLayoutFacetFactory.java | 45 +-
.../DomainServiceFacetAnnotationFactory.java | 12 +-
.../DomainServiceLayoutFacetFactory.java | 5 +-
.../facets/object/entity/EntityFacet.java | 9 +-
.../facets/object/entity/EntityFacetSimple.java | 35 -
.../facets/object/grid/GridFacetFactory.java | 3 +-
.../facets/object/layout/LayoutFacetFactory.java | 3 +-
.../NavigableParentAnnotationFacetFactory.java | 3 +-
.../ObjectValidPropertiesFacetImplFactory.java | 3 +-
...CollectionDerivedFromViewModelFacetFactory.java | 3 +-
...tyDerivedFromRecreatableObjectFacetFactory.java | 3 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 8 +-
.../title/methods/TitleFacetViaTitleMethod.java | 8 +-
...cationFromMustSatisfyAnnotationOnTypeFacet.java | 84 ---
...ValueFacetAnnotationOrConfigurationFactory.java | 8 +-
.../ValueFacetUsingSemanticsProviderFactory.java | 2 +-
.../mandatory/MandatoryFacetAbstract.java | 18 +-
...ParameterAutoCompleteFacetViaMethodFactory.java | 3 +-
...ameterFromJavaxValidationAnnotationFactory.java | 3 +-
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 3 +-
.../method/ActionChoicesFacetViaMethodFactory.java | 4 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 5 +-
...arameterDefaultFacetDerivedFromTypeFactory.java | 3 +-
...tionParameterDefaultsFacetViaMethodFactory.java | 5 +-
...tionParameterDisabledFacetViaMethodFactory.java | 3 +-
...ActionParameterHiddenFacetViaMethodFactory.java | 5 +-
.../param/layout/ParameterLayoutFacetFactory.java | 15 +-
.../MandatoryFacetOnParametersDefaultFactory.java | 3 +-
.../parameter/ParameterAnnotationFacetFactory.java | 25 +-
...onParameterValidationFacetViaMethodFactory.java | 3 +-
.../accessor/PropertyAccessorFacetViaAccessor.java | 4 +-
...FromJavaxValidationDigitsAnnotationFactory.java | 3 +-
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 3 +-
...FacetOnPropertyDerivedFromImmutableFactory.java | 3 +-
.../property/PropertyAnnotationFacetFactory.java | 39 +-
.../propertylayout/PropertyLayoutFacetFactory.java | 37 +-
.../dflt/PropertyValidateFacetDefaultFactory.java | 5 +-
.../PropertyValidateFacetViaMethodFactory.java | 3 +-
.../JodaLocalTimeValueFacetSimpleFactory.java | 3 +-
.../metamodel/interactions/InteractionUtils.java | 4 +-
.../param/DeriveFacetsPostProcessor.java | 58 +-
.../progmodel/ProgrammingModelAbstract.java | 58 +-
.../services/grid/GridSystemServiceAbstract.java | 3 +-
.../services/registry/ServiceRegistryDefault.java | 16 +-
.../apache/isis/metamodel/spec/ManagedObject.java | 120 +--
.../isis/metamodel/spec/feature/ObjectAction.java | 22 +-
.../isis/metamodel/spec/feature/ObjectMember.java | 20 +-
.../specloader/ProgrammingModelServiceDefault.java | 4 +-
.../specloader/SpecificationLoaderDefault.java | 42 +-
.../specloader/facetprocessor/FacetProcessor.java | 16 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 11 +-
.../specimpl/FacetedMethodsBuilderContext.java | 34 -
.../specimpl/ObjectActionContributee.java | 6 +-
.../specloader/specimpl/ObjectActionDefault.java | 6 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 12 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 14 +-
.../specimpl/ObjectSpecificationAbstract.java | 18 +-
.../specimpl/OneToManyAssociationContributee.java | 12 +-
.../specimpl/OneToManyAssociationDefault.java | 3 +-
.../specimpl/OneToManyAssociationMixedIn.java | 16 +-
.../specimpl/OneToOneAssociationDefault.java | 3 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 10 +-
.../validator/MetaModelValidatorAbstract.java | 10 +-
...etaModelValidatorForConflictingOptionality.java | 3 -
.../MetaModelValidatorForDeprecatedAbstract.java | 3 +-
.../MetaModelValidatorForDeprecatedAnnotation.java | 3 +-
...etaModelValidatorForDeprecatedMethodPrefix.java | 3 +-
.../MetaModelValidatorForValidationFailures.java | 10 -
.../validator/MetaModelValidatorVisiting.java | 127 ++--
.../isis/metamodel/util/snapshot/XmlSnapshot.java | 11 +-
.../metamodel/MetaModelContext_configTest.java | 8 +-
.../metamodel/MetaModelContext_forTesting.java | 92 ++-
.../isis/metamodel/ServiceInjector_forTesting.java | 7 +-
.../isis/metamodel/ServiceRegistry_forTesting.java | 23 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 65 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 13 +-
.../actions/ActionMethodsFacetFactoryTest.java | 41 +-
.../action/ActionAnnotationFacetFactoryTest.java | 16 +-
...nnotationFacetFactoryTest_ActionInvocation.java | 16 +-
.../ActionAnnotationFacetFactoryTest_Hidden.java | 10 +-
...ctionAnnotationFacetFactoryTest_Invocation.java | 8 +-
.../PrototypeFacetAnnotationFactoryTest.java | 1 +
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 1 +
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 1 +
...etDerivedFromDomainServiceFacetFactoryTest.java | 1 +
...etDerivedFromDomainServiceFacetFactoryTest.java | 2 +
.../CollectionFieldMethodsFacetFactoryTest.java | 69 +-
.../collections/JavaCollectionFacetTest.java | 22 +-
...ollectionAnnotationFacetFactoryTest_typeOf.java | 1 +
...etForCollectionLayoutAnnotationFactoryTest.java | 8 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 14 +-
.../object/defaults/DefaultedFacetFactoryTest.java | 1 +
.../ObjectDisabledMethodFacetFactoryTest.java | 1 +
.../DomainObjectAnnotationFacetFactoryTest.java | 24 +-
.../DomainObjectLayoutFactoryTest.java | 1 +
.../ident/title/TitleFacetViaMethodTest.java | 11 +
.../title/TitleFacetViaMethodsFactoryTest.java | 1 +
.../TitleFacetViaTitleAnnotationTest.java | 27 +-
.../parseable/ParseableFacetUsingParserTest.java | 52 +-
.../ObjectValidMethodFacetFactoryTest.java | 1 +
...eFacetAnnotationOrConfigurationFactoryTest.java | 1 +
.../MemberOrderAnnotationFacetFactoryTest.java | 1 +
.../ParameterAnnotationFacetFactoryTest.java | 7 +-
...RegExAnnotationOnParameterFacetFactoryTest.java | 1 +
.../PropertyMethodsFacetFactoryTest.java | 84 ++-
.../PropertyAnnotationFacetFactoryTest.java | 7 +-
...SpecificationValidatingInteractionMoreTest.java | 147 ----
...isfySpecificationValidatingInteractionTest.java | 141 ----
.../BigDecimalValueSemanticsProviderTest.java | 2 +
.../value/BigIntValueSemanticsProviderTest.java | 3 +
.../value/ByteValueSemanticsProviderTest.java | 2 +
.../value/DoubleValueSemanticsProviderTest.java | 2 +
.../value/FloatValueSemanticsProviderTest.java | 3 +
.../value/IntValueSemanticsProviderTest.java | 3 +
.../JavaSqlDateValueSemanticsProviderTest.java | 3 +
.../JavaSqlTimeValueSemanticsProviderTest.java | 3 +
.../JavaUtilDateValueSemanticsProviderTest.java | 3 +
.../value/LongValueSemanticsProviderTest.java | 2 +
.../value/MoneyValueSemanticsProviderTest.java | 3 +
.../PercentageValueSemanticsProviderTest.java | 2 +
.../value/ShortValueSemanticsProviderTest.java | 2 +
.../ValueSemanticsProviderAbstractTestCase.java | 33 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 23 +-
...erviceInjectorDefaultTest_validateServices.java | 4 -
.../SpecificationLoaderTestAbstract.java | 47 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
core/plugins/jaxrs-resteasy-4/pom.xml | 62 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 48 +-
.../service/JdoPersistenceLifecycleService.java | 5 +-
.../isis/jdo/entities/JdoEntityTypeRegistry.java | 6 -
.../JdoStoreLifecycleListenerForIsis.java | 17 +-
.../jdo/metamodel/JdoProgrammingModelPlugin.java | 2 +-
...doPersistenceCapableAnnotationFacetFactory.java | 2 +-
.../JdoPersistenceCapableFacetAbstract.java | 32 +-
.../JdoPersistenceCapableFacetImpl.java | 43 ++
.../query/JdoQueryAnnotationFacetFactory.java | 5 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 5 +-
.../JdoPrimaryKeyAnnotationFacetFactory.java | 7 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 21 +-
.../isis/jdo/persistence/IsisTransactionJdo.java | 4 +-
.../jdo/persistence/IsisTransactionManagerJdo.java | 10 +-
...AnnotationFacetFactoryTest_refineMetaModel.java | 10 +-
.../jdo/datanucleus/JDOStateManagerForIsis.java | 20 +-
.../PersistenceQueryFindAllInstancesProcessor.java | 20 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 29 +-
.../queries/PersistenceQueryProcessorAbstract.java | 6 +-
.../persistence/spi/JdoObjectIdSerializer.java | 33 +-
.../isis/jdo/jdosupport/IsisJdoSupportDN5.java | 6 +-
.../DataNucleusApplicationComponents5.java | 39 +-
.../isis/jdo/persistence/PersistenceSession5.java | 22 +-
.../persistence/PersistenceSessionFactory5.java | 47 +-
.../runtime/system/ObjectMemberAbstractTest.java | 57 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 71 +-
...FactoryDefaultTest_wrappedObject_transient.java | 60 +-
.../org/apache/isis/runtime/spring/IsisBoot.java | 6 +-
.../org/apache/isis/wrapper/AsyncWrapDefault.java | 15 +-
.../apache/isis/wrapper/WrapperFactoryDefault.java | 13 +-
.../AbstractCollectionInvocationHandler.java | 6 +-
.../handlers/CollectionInvocationHandler.java | 1 +
.../DelegatingInvocationHandlerDefault.java | 4 +-
.../handlers/DomainObjectInvocationHandler.java | 22 +-
.../isis/wrapper/handlers/ProxyContextHandler.java | 4 +-
.../AuthenticationSessionProviderDefault.java | 12 +-
.../background/BackgroundCommandExecution.java | 13 +-
.../background/CommandExecutionAbstract.java | 4 +-
.../background/CommandExecutorServiceDefault.java | 3 +-
.../command/CommandDtoServiceInternalDefault.java | 17 +-
.../homepage/HomePageResolverServiceDefault.java | 31 +-
.../services/i18n/po/TranslationServicePo.java | 10 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 3 +-
.../services/xmlsnapshot/XmlSnapshotBuilder.java | 14 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 16 +-
core/runtime-web/pom.xml | 7 +
.../isis/webapp/IsisWebAppContextListener.java | 38 +-
.../org/apache/isis/webapp/IsisWebAppUtils.java | 17 +-
.../AuthenticationSessionStrategyAbstract.java | 24 +-
.../AuthenticationSessionStrategyBasicAuth.java | 3 +-
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
.../webapp/context/IsisWebAppCommonContext.java | 136 ++++
.../org/apache/isis/webapp/modules/WebModule.java | 8 +-
.../isis/webapp/modules/WebModuleContext.java | 7 +-
.../java/org/apache/isis/runtime/memento/Data.java | 7 -
.../org/apache/isis/runtime/memento/Memento.java | 155 ++--
.../isis/runtime/memento/ObjectAdapterMemento.java | 52 +-
...nGood.java => ObjectAdapterMementoDefault.java} | 370 +++++----
.../memento/ObjectAdapterMementoSupport.java | 15 +-
... ObjectAdapterMementoSupport_usingDefault.java} | 35 +-
.../memento/ObjectAdapterMementoUsingSupport.java | 88 ---
.../isis/runtime/memento/StandaloneData.java | 37 +-
.../AbstractIsisSessionTemplate.java | 23 +-
.../isis/runtime/system/MessageRegistry.java | 2 +
.../isis/runtime/system/context/IsisContext.java | 130 +---
.../system/context/session/RuntimeContext.java | 3 +
.../system/context/session/RuntimeContextBase.java | 55 +-
.../system/internal/IsisLocaleInitializer.java | 2 +-
.../persistence/PersistenceSessionFactory.java | 3 +-
.../adaptermanager/ObjectAdapterContext.java | 22 +-
.../ObjectAdapterContext_MementoSupport.java | 8 +-
...ObjectAdapterContext_ObjectAdapterProvider.java | 18 +-
.../ObjectAdapterContext_OidProviders.java | 141 ----
.../runtime/system/session/IsisRequestCycle.java | 4 +-
.../isis/runtime/system/session/IsisSession.java | 25 +-
.../system/session/IsisSessionFactoryDefault.java | 25 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 18 +-
.../system/OneToManyAssociationDefaultTest.java | 43 +-
.../fixtures/LogonFixtureAuthenticator.java | 50 --
.../fixture/LogonFixtureAuthenticatorTest.java | 71 --
.../apache/isis/security/shiro/WebModuleShiro.java | 47 +-
.../ExceptionRecognizerTranslate.java | 20 +-
.../validate/ValidateDomainModel.java | 8 +-
.../jmocking/JUnitRuleMockery2.java | 6 +-
.../applib/domainobjects/DomainRepresentation.java | 4 +-
.../viewer/restfulobjects/rendering/OidUtils.java | 3 +-
.../rendering/ReprRendererAbstract.java | 20 +-
.../viewer/restfulobjects/rendering/Responses.java | 32 +-
.../AbstractObjectMemberReprRenderer.java | 3 +-
.../domainobjects/DomainObjectReprRenderer.java | 20 +-
.../rendering/domainobjects/JsonValueEncoder.java | 830 +++------------------
...coder.java => JsonValueEncoder_Converters.java} | 401 +++-------
.../domainobjects/ObjectActionReprRenderer.java | 10 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 23 +-
.../domainobjects/ScalarValueReprRenderer.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 16 +-
.../rendering/util/JsonWriterUtil.java | 19 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 84 ++-
.../JsonValueEncoderTest_asAdapter.java | 62 +-
.../JsonValueEncoderTest_asObject.java | 46 +-
core/viewer-restfulobjects/server/pom.xml | 8 +
.../IsisRestfulObjectsSessionFilter.java | 19 +-
.../restfulobjects/WebModuleRestfulObjects.java | 6 +-
.../restfulobjects/server/ResourceContext.java | 6 +-
.../server/RestfulObjectsApplicationException.java | 37 -
.../server/resources/DomainResourceHelper.java | 6 +
.../resources/DomainServiceResourceServerside.java | 3 +-
.../server/resources/HealthResourceServerside.java | 13 +-
.../server/resources/HomePageReprRenderer.java | 3 +-
.../server/resources/JsonParserHelper.java | 10 +-
.../resources/MenuBarsResourceServerside.java | 2 +-
.../server/resources/ResourceAbstract.java | 6 +-
.../server/resources/SwaggerSpecResource.java | 35 +-
.../server/resources/UserResourceServerside.java | 2 +-
.../IsisTransactionFilterForRestfulObjects.java | 13 +-
.../server/ResourceContextTest_getArg.java | 61 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 43 +-
core/viewer-wicket/impl/pom.xml | 9 +-
.../viewer/wicket/viewer/IsisBootWebWicket.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 433 +++++------
.../IsisWicketApplication_newPageFactory.java | 74 ++
.../viewer/IsisWicketApplication_newSession.java | 36 +-
...rgetRespondListenerToResetQueryResultCache.java | 11 +-
.../imagecache/ImageResourceCacheClassPath.java | 5 +-
.../wicket/AnonymousWebSessionForIsis.java | 15 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 48 +-
.../wicket/ConverterForObjectAdapter.java | 11 +-
.../wicket/ConverterForObjectAdapterMemento.java | 8 +-
.../integration/wicket/LocalizerForIsis.java | 18 +-
.../integration/wicket/WebRequestCycleForIsis.java | 531 +++++++------
.../ObjectAdapterMementoSupportUsingSpring.java | 224 ------
.../ComponentFactoryRegistrarDefault.java | 8 +-
.../ComponentFactoryRegistryDefault.java | 58 +-
.../registries/pages/PageClassRegistryDefault.java | 5 +-
.../services/EmailNotificationServiceWicket.java | 61 --
.../services/HintStoreUsingWicketSession.java | 5 +-
.../services/TranslationsResolverWicket.java | 46 +-
.../settings/WicketViewerSettingsDefault.java | 14 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 54 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 43 +-
...thenticatedWebSessionForIsis_TestAbstract.java} | 69 +-
.../services/TranslationsResolverWicketTest.java | 4 +-
core/viewer-wicket/model/pom.xml | 2 +-
.../wicket/model/mementos/CollectionMemento.java | 8 +-
.../wicket/model/mementos/PropertyMemento.java | 7 +-
.../viewer/wicket/model/models/AboutModel.java | 6 +-
.../viewer/wicket/model/models/ActionModel.java | 91 ++-
.../wicket/model/models/BookmarkableModel.java | 10 +-
.../wicket/model/models/BookmarkedPagesModel.java | 19 +-
.../wicket/model/models/EntityCollectionModel.java | 236 +++---
.../viewer/wicket/model/models/EntityModel.java | 123 +--
.../model/models/EntityModelForReference.java | 13 +-
.../wicket/model/models/FormExecutorContext.java | 14 +-
.../model/models/HintPageParameterSerializer.java | 82 +-
.../viewer/wicket/model/models/ModelAbstract.java | 42 +-
.../viewer/wicket/model/models/ScalarModel.java | 50 +-
.../wicket/model/models/ServiceActionsModel.java | 16 +-
.../viewer/wicket/model/models/ValueModel.java | 6 +-
.../isis/viewer/wicket/model/models/VoidModel.java | 4 +-
.../viewer/wicket/model/models/WelcomeModel.java | 5 +-
.../models/whereami/WhereAmIModelDefault.java | 23 +-
.../viewer/wicket/model/util/ComponentHintKey.java | 50 +-
.../wicket/model/models/EntityModel_hintsTest.java | 33 +-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 51 +-
core/viewer-wicket/ui/pom.xml | 25 +-
.../viewer/wicket/ui/ComponentFactoryAbstract.java | 18 +-
.../ActionResultResponseHandlingStrategy.java | 31 +-
.../actionresponse/ActionResultResponseType.java | 24 +-
.../ui/app/registry/ComponentFactoryRegistrar.java | 10 +-
.../wicket/ui/components/about/AboutPanel.java | 8 +-
.../ui/components/about/JarManifestModel.java | 23 +-
.../ui/components/actionlink/ActionLinkPanel.java | 12 -
.../components/actionmenu/CssClassFaBehavior.java | 2 +
.../actionmenu/serviceactions/CssMenuItem.java | 10 -
.../serviceactions/ServiceActionUtil.java | 42 +-
.../serviceactions/ServiceActionsPanel.java | 10 +-
.../serviceactions/ServiceActionsPanelFactory.java | 17 +-
.../serviceactions/TertiaryActionsPanel.java | 9 +-
.../serviceactions/TertiaryMenuPanelFactory.java | 24 +-
.../actionprompt/ActionPromptHeaderPanel.java | 9 +-
.../actions/ActionFormExecutorStrategy.java | 15 +-
.../components/actions/ActionParametersForm.java | 4 +-
.../components/actions/ActionParametersPanel.java | 14 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 14 +-
.../collection/AssociatedWithActionsHelper.java | 9 +-
.../ui/components/collection/CollectionPanel.java | 8 +-
.../CollectionContentsAsAjaxTablePanel.java | 11 +-
.../CollectionContentsSortableDataProvider.java | 75 +-
.../ajaxtable/IsisAjaxNavigationToolbar.java | 16 +-
.../ajaxtable/IsisTotalRecordsToolbar.java | 10 +-
.../ajaxtable/PrototypingMessageProvider.java | 7 +-
.../ajaxtable/columns/ColumnAbstract.java | 14 +-
.../columns/ObjectAdapterPropertyColumn.java | 21 +-
.../columns/ObjectAdapterTitleColumn.java | 11 +-
.../columns/ObjectAdapterToggleboxColumn.java | 13 +-
.../icons/CollectionContentsAsIconsPanel.java | 3 +-
.../CollectionContentsMultipleViewsPanel.java | 2 +-
...ollectionContentsMultipleViewsPanelFactory.java | 3 +-
.../summary/CollectionContentsAsSummary.java | 11 +-
.../entity/EntityComponentFactoryAbstract.java | 11 +-
.../entity/collection/EntityCollectionPanel.java | 5 +-
.../components/entity/fieldset/PropertyGroup.java | 31 +-
.../entity/icontitle/EntityIconAndTitlePanel.java | 47 +-
.../icontitle/EntityIconAndTitlePanelFactory.java | 11 +-
.../selector/links/EntityLinksSelectorPanel.java | 12 +-
.../wicket/ui/components/footer/FooterPanel.java | 8 +-
.../wicket/ui/components/header/HeaderPanel.java | 21 +-
.../wicket/ui/components/layout/bs3/col/Col.java | 27 +-
.../components/layout/bs3/tabs/TabGroupPanel.java | 20 +-
.../ui/components/property/PropertyEditPanel.java | 16 +-
.../property/PropertyFormExecutorStrategy.java | 2 +-
.../PropertyEditPromptHeaderPanel.java | 5 +-
.../scalars/ComponentFactoryScalarAbstract.java | 5 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 3 -
.../components/scalars/ScalarPanelAbstract2.java | 18 +-
.../scalars/ScalarPanelSelect2Abstract.java | 6 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 23 +-
.../ScalarPanelTextFieldDatePickerAbstract.java | 18 +-
.../scalars/ScalarPanelTextFieldNumeric.java | 12 +-
.../ui/components/scalars/TextFieldValueModel.java | 13 +-
.../datepicker/TextFieldWithDateTimePicker.java | 39 +-
.../scalars/isisapplib/IsisClobPanel.java | 5 +-
.../scalars/jdk8time/Jdk8LocalDateTimePanel.java | 2 +-
.../scalars/jdk8time/Jdk8OffsetDateTimePanel.java | 2 +-
.../scalars/jdkmath/JavaMathBigIntegerPanel.java | 1 -
.../scalars/jodatime/JodaDateTimePanel.java | 2 +-
.../scalars/jodatime/JodaLocalDateTimePanel.java | 2 +-
.../scalars/reference/ReferencePanel.java | 24 +-
.../scalars/string/StringPanelFactory.java | 4 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 9 +-
.../components/tree/IsisToWicketTreeAdapter.java | 63 +-
.../ui/components/welcome/WelcomePanelFactory.java | 11 +-
.../ui/components/widgets/bootstrap/FormGroup.java | 2 +
.../components/widgets/bootstrap/ModalDialog.java | 2 +
.../widgets/breadcrumbs/BreadcrumbModel.java | 24 +-
.../breadcrumbs/BreadcrumbModelProvider.java | 1 -
.../widgets/breadcrumbs/BreadcrumbPanel.java | 26 +-
.../widgets/linkandlabel/ActionLink.java | 28 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 37 +-
.../ObjectAdapterMementoProviderAbstract.java | 43 +-
...tAdapterMementoProviderForReferenceChoices.java | 18 +-
...entoProviderForReferenceObjectAutoComplete.java | 22 +-
...derForReferenceParamOrPropertyAutoComplete.java | 27 +-
...bjectAdapterMementoProviderForValueChoices.java | 17 +-
.../themepicker/IsisWicketThemeSupport.java | 16 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 19 +-
.../widgets/themepicker/ThemeChooser.java | 21 +-
.../widgets/zclip/ZeroClipboardPanel.java | 12 +-
.../viewer/wicket/ui/errors/ExceptionModel.java | 43 +-
.../wicket/ui/errors/ExceptionStackTracePanel.java | 3 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 14 +-
.../BootstrapOverridesCssResourceReference.java | 2 +
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 145 ++--
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 61 ++
.../ui/pages/accmngt/AccountConfirmationMap.java | 1 +
.../accmngt/AccountManagementPageAbstract.java | 39 +-
.../ui/pages/accmngt/EmailAvailableValidator.java | 38 +-
.../pages/accmngt/UsernameAvailableValidator.java | 35 +-
.../password_reset/PasswordResetEmailPanel.java | 11 +-
.../accmngt/password_reset/PasswordResetPage.java | 3 +-
.../accmngt/password_reset/PasswordResetPanel.java | 18 +-
.../ui/pages/accmngt/register/RegisterPage.java | 2 +
.../ui/pages/accmngt/register/RegisterPanel.java | 58 +-
.../pages/accmngt/signup/RegistrationFormPage.java | 1 -
.../accmngt/signup/RegistrationFormPanel.java | 8 +-
.../ui/pages/actionprompt/ActionPromptPage.java | 34 +-
.../viewer/wicket/ui/pages/entity/EntityPage.java | 43 +-
.../viewer/wicket/ui/pages/error/ErrorPage.java | 6 +-
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 4 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 23 +-
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 23 +-
.../wicket/ui/panels/FormExecutorDefault.java | 49 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 117 +--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 92 +++
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 11 +-
.../wicket/ui/panels/PromptFormAbstract.java | 5 +-
.../wicket/ui/panels/PromptFormPanelAbstract.java | 13 +-
.../viewer/wicket/ui/util/CssClassRemover.java | 13 +-
.../apache/isis/viewer/wicket/ui/util/Links.java | 47 +-
.../wicket/ui/validation/ValidatorBase.java} | 34 +-
.../ui/ComponentFactoryAbstractTest_init.java | 21 +-
...ollectionContentsSelectorDropdownPanelTest.java | 26 +-
...tAdapterMementoProviderForValueChoicesTest.java | 48 +-
.../domainapp/dom/types/blob/DemoBlobStore.java | 53 +-
.../bdd/specs/SimpleObjectsStepDef.java | 6 +-
.../integtests/mml/DomainModel_IntegTest.java | 7 +-
...stService.java => RestEndpointTestService.java} | 2 +-
.../testdomain/auditing/AuditerServiceTest.java | 6 +-
.../bootstrapping/AutoConfigurationTest.java | 11 +-
.../SpringServiceProvisioningTest.java | 7 +-
.../DomainModelTest_usingBadDomain.java | 12 +-
.../DomainModelTest_usingGoodDomain.java | 12 +-
.../publishing/PublisherServiceTest.java | 6 +-
.../isis/testdomain/rest/RestServiceTest.java | 4 +-
.../isis/testdomain/shiro/AbstractShiroTest.java | 33 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 20 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 30 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 42 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 31 +-
.../isis/testdomain/shiro/ShiroSimpleTest.java | 9 +-
.../bootstrapping/builtin-singleton.list | 1 -
.../extensions/fixtures/FixturesEventService.java | 63 --
.../isis/extensions/fixtures/IsisBootFixtures.java | 1 -
.../fixtures/fixturescripts/FixtureScript.java | 5 +-
.../apache/isis/applib/DomainObjectContainer.java | 7 +-
.../facets/TenantedAuthorizationFacetFactory.java | 3 +-
.../secman/shiro/IsisModuleSecurityRealm.java | 16 +-
.../shiro/SecurityRealmServiceUsingShiro.java | 11 +-
.../specsupport/ObjectFactoryForIntegration.java | 12 +-
.../extensions/sse/services/SseServiceDefault.java | 4 +-
.../sse/webapp/ServerSentEventsServlet.java | 17 +-
extensions/viewer-wicket-excel/pom.xml | 15 +-
.../excel/CollectionContentsAsExcelFactory.java | 4 +-
mavendeps/webapp/pom.xml | 5 +
507 files changed, 6219 insertions(+), 7583 deletions(-)
create mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
create mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
rename core/{runtime/src/main/java/org/apache/isis/runtime/system => config/src/main/java/org/apache/isis/config}/SystemConstants.java (72%)
copy core/metamodel/src/main/java/org/apache/isis/metamodel/{IsisMetamodelModule.java => MetaModelContextAware.java} (86%)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingCDI.java
rename core/metamodel/src/main/java/org/apache/isis/metamodel/{MetaModelContext_usingSpring.java => MetaModelContext_usingIoc.java} (80%)
rename core/{runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/factories => metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/factory}/OidFactory.java (54%)
rename core/{runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/factories => metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/factory}/OidFactory_Builder.java (57%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/factory/OidFactory_OidProviders.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/entity/EntityFacetSimple.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilderContext.java
rename core/metamodel/src/{main => test}/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java (66%)
rename core/metamodel/src/{main => test}/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java (92%)
rename core/metamodel/src/{main => test}/java/org/apache/isis/metamodel/ServiceRegistry_forTesting.java (87%)
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
copy examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java => core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppUtils.java (66%)
create mode 100644 core/runtime-web/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
rename core/runtime/src/main/java/org/apache/isis/runtime/memento/{ObjectAdapterMemento_LastKnownGood.java => ObjectAdapterMementoDefault.java} (52%)
rename core/runtime/src/main/java/org/apache/isis/runtime/memento/{ObjectAdapterMementoSupport_usingLKG.java => ObjectAdapterMementoSupport_usingDefault.java} (78%)
delete mode 100644 core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMementoUsingSupport.java
delete mode 100644 core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_OidProviders.java
delete mode 100644 core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
delete mode 100644 core/security/api/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
copy core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/{JsonValueEncoder.java => JsonValueEncoder_Converters.java} (61%)
delete mode 100644 core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java
create mode 100644 core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newPageFactory.java
copy examples/apps/demo/src/main/java/domainapp/dom/types/blob/BlobDemo_downloadLogo.java => core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newSession.java (59%)
delete mode 100644 core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
delete mode 100644 core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
copy core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/{AuthenticatedWebSessionForIsis_SignIn.java => AuthenticatedWebSessionForIsis_TestAbstract.java} (51%)
create mode 100644 core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
create mode 100644 core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
copy core/{commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java => viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java} (62%)
rename examples/smoketests/src/main/java/org/apache/isis/testdomain/rest/{RestService.java => RestEndpointTestService.java} (98%)
delete mode 100644 extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesEventService.java